diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-08-24 17:37:16 +0200 |
|---|---|---|
| committer | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-11-15 11:22:56 +0100 |
| commit | 0c1a94e299eed7ea11ebc407d1e08a26c594abe5 (patch) | |
| tree | f70b464dda43fc2604bd1399348da07d191b0169 /drivers/net/wireless/iwlegacy/iwl3945-base.c | |
| parent | iwlegacy: remove _il_{read,write}_direct32 (diff) | |
| download | linux-0c1a94e299eed7ea11ebc407d1e08a26c594abe5.tar.xz linux-0c1a94e299eed7ea11ebc407d1e08a26c594abe5.zip | |
iwlegacy: rename i/o direct methods
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl3945-base.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl3945-base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c index d45e9f532dcc..a0b5a74972a9 100644 --- a/drivers/net/wireless/iwlegacy/iwl3945-base.c +++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c @@ -1520,7 +1520,7 @@ static void il3945_irq_tasklet(struct il_priv *il) il->isr_stats.tx++; _il_wr(il, CSR_FH_INT_STATUS, (1 << 6)); - il_write_direct32(il, FH39_TCSR_CREDIT + il_wr(il, FH39_TCSR_CREDIT (FH39_SRVC_CHNL), 0x0); handled |= CSR_INT_BIT_FH_TX; } @@ -1698,7 +1698,7 @@ static int il3945_verify_inst_full(struct il_priv *il, __le32 *image, u32 len) D_INFO("ucode inst image size is %u\n", len); - il_write_direct32(il, HBUS_TARG_MEM_RADDR, + il_wr(il, HBUS_TARG_MEM_RADDR, IWL39_RTC_INST_LOWER_BOUND); errcnt = 0; @@ -1745,7 +1745,7 @@ static int il3945_verify_inst_sparse(struct il_priv *il, __le32 *image, u32 len) /* read data comes through single port, auto-incr addr */ /* NOTE: Use the debugless read so we don't flood kernel log * if IL_DL_IO is set */ - il_write_direct32(il, HBUS_TARG_MEM_RADDR, + il_wr(il, HBUS_TARG_MEM_RADDR, i + IWL39_RTC_INST_LOWER_BOUND); val = _il_rd(il, HBUS_TARG_MEM_RDAT); if (val != le32_to_cpu(*image)) { |