diff options
| author | Stanislaw Gruszka | 2011-08-24 15:14:03 +0200 |
|---|---|---|
| committer | Stanislaw Gruszka | 2011-11-15 11:22:15 +0100 |
| commit | 841b2ccac3251fdbf7a0bc26724874cdc35df96c (patch) | |
| tree | 009166cc494f8b4c1aa4247b40e0bd82ce63e41f /drivers/net/wireless/iwlegacy/iwl-core.c | |
| parent | iwlegacy: remove IL_CRIT (diff) | |
| download | kernel-qcow2-linux-841b2ccac3251fdbf7a0bc26724874cdc35df96c.tar.gz kernel-qcow2-linux-841b2ccac3251fdbf7a0bc26724874cdc35df96c.tar.xz kernel-qcow2-linux-841b2ccac3251fdbf7a0bc26724874cdc35df96c.zip | |
iwlegacy: rename il_{read,write}32 to _il_{rd,wr}
Introduce rule that underscore at the beginning mean unlocked I/O method.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-core.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-core.c b/drivers/net/wireless/iwlegacy/iwl-core.c index 42be833bdc75..c5ffd91af5d0 100644 --- a/drivers/net/wireless/iwlegacy/iwl-core.c +++ b/drivers/net/wireless/iwlegacy/iwl-core.c @@ -2001,7 +2001,7 @@ int il_pci_resume(struct device *device) il_enable_interrupts(il); - if (!(il_read32(il, CSR_GP_CNTRL) & + if (!(_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)) hw_rfkill = true; @@ -2580,12 +2580,12 @@ irqreturn_t il_isr(int irq, void *data) * back-to-back ISRs and sporadic interrupts from our NIC. * If we have something to service, the tasklet will re-enable ints. * If we *don't* have something, we'll re-enable before leaving here. */ - inta_mask = il_read32(il, CSR_INT_MASK); /* just for debug */ - il_write32(il, CSR_INT_MASK, 0x00000000); + inta_mask = _il_rd(il, CSR_INT_MASK); /* just for debug */ + _il_wr(il, CSR_INT_MASK, 0x00000000); /* Discover which interrupts are active/pending */ - inta = il_read32(il, CSR_INT); - inta_fh = il_read32(il, CSR_FH_INT_STATUS); + inta = _il_rd(il, CSR_INT); + inta_fh = _il_rd(il, CSR_FH_INT_STATUS); /* Ignore interrupt if there's nothing in NIC to service. * This may be due to IRQ shared with another device, |