summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/iwl3945-base.c
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2011-08-24 15:46:03 +0200
committerStanislaw Gruszka <sgruszka@redhat.com>2011-11-15 11:22:42 +0100
commit1c8cae575b14ffad6af9c80927a08aa783f0ed78 (patch)
treed53cb3be8c14564b31452ca427899dfb2fc91459 /drivers/net/wireless/iwlegacy/iwl3945-base.c
parentiwlegacy: mark il_{grab,release}_nic_access as unlocked (diff)
downloadlinux-1c8cae575b14ffad6af9c80927a08aa783f0ed78.tar.xz
linux-1c8cae575b14ffad6af9c80927a08aa783f0ed78.zip
iwlegacy: remove _il_{read,write}_direct32
Use _il_{rd,wr} instead of another name of these operations. 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
index def314073ce8..d45e9f532dcc 100644
--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
@@ -1706,7 +1706,7 @@ static int il3945_verify_inst_full(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 */
- val = _il_read_direct32(il, HBUS_TARG_MEM_RDAT);
+ val = _il_rd(il, HBUS_TARG_MEM_RDAT);
if (val != le32_to_cpu(*image)) {
IL_ERR("uCode INST section is invalid at "
"offset 0x%x, is 0x%x, s/b 0x%x\n",
@@ -1747,7 +1747,7 @@ static int il3945_verify_inst_sparse(struct il_priv *il, __le32 *image, u32 len)
* if IL_DL_IO is set */
il_write_direct32(il, HBUS_TARG_MEM_RADDR,
i + IWL39_RTC_INST_LOWER_BOUND);
- val = _il_read_direct32(il, HBUS_TARG_MEM_RDAT);
+ val = _il_rd(il, HBUS_TARG_MEM_RDAT);
if (val != le32_to_cpu(*image)) {
#if 0 /* Enable this if you want to see details */
IL_ERR("uCode INST section is invalid at "