iwlagn: move IO functions out of line

This generates a massive reduction in module size:
with debug:
   text	   data	    bss	    dec	    hex	filename
 670300	  13136	    420	 683856	  a6f50	iwlagn.ko (before)
 388347	  13136	    408	 401891	  621e3	iwlagn.ko (after)

without debug:
   text	   data	    bss	    dec	    hex	filename
 528575	  13072	    420	 542067	  84573	iwlagn.ko (before)
 294192	  13072	    408	 307672	  4b1d8	iwlagn.ko (after)

This also removes all the IO debug functionality since
it can easily be replaced by tracing, and makes the
code unnecessarily complex.

I haven't done any CPU utilisation measurements, but
given that the hotpaths don't use much IO it is not
likely to have a negative impact; in fact, the size
reduction will reduce cache pressure which possibly
improves performance.

Finally, an unused function or two were removed.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 18 insertions, 18 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
index 4f8c13e9850b..859b94a12297 100644
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c
@@ -226,15 +226,15 @@ static int iwl_init_otp_access(struct iwl_priv *priv)
         int ret;
 
         /* Enable 40MHz radio clock */
-        _iwl_write32(priv, CSR_GP_CNTRL,
-                     _iwl_read32(priv, CSR_GP_CNTRL) |
-                     CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
+        iwl_write32(priv, CSR_GP_CNTRL,
+                    iwl_read32(priv, CSR_GP_CNTRL) |
+                    CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
 
         /* wait for clock to be ready */
         ret = iwl_poll_bit(priv, CSR_GP_CNTRL,
-                                  CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
-                                  CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
-                                  25000);
+                                 CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
+                                 CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
+                                 25000);
         if (ret < 0)
                 IWL_ERR(priv, "Time out access OTP\n");
         else {
@@ -261,17 +261,17 @@ static int iwl_read_otp_word(struct iwl_priv *priv, u16 addr, __le16 *eeprom_dat
         u32 r;
         u32 otpgp;
 
-        _iwl_write32(priv, CSR_EEPROM_REG,
-                     CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
+        iwl_write32(priv, CSR_EEPROM_REG,
+                    CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
         ret = iwl_poll_bit(priv, CSR_EEPROM_REG,
-                                  CSR_EEPROM_REG_READ_VALID_MSK,
-                                  CSR_EEPROM_REG_READ_VALID_MSK,
-                                  IWL_EEPROM_ACCESS_TIMEOUT);
+                                 CSR_EEPROM_REG_READ_VALID_MSK,
+                                 CSR_EEPROM_REG_READ_VALID_MSK,
+                                 IWL_EEPROM_ACCESS_TIMEOUT);
         if (ret < 0) {
                 IWL_ERR(priv, "Time out reading OTP[%d]\n", addr);
                 return ret;
         }
-        r = _iwl_read_direct32(priv, CSR_EEPROM_REG);
+        r = iwl_read32(priv, CSR_EEPROM_REG);
         /* check for ECC errors: */
         otpgp = iwl_read32(priv, CSR_OTP_GP_REG);
         if (otpgp & CSR_OTP_GP_REG_ECC_UNCORR_STATUS_MSK) {
@@ -442,9 +442,9 @@ int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)
                         ret = -ENOENT;
                         goto done;
                 }
-                _iwl_write32(priv, CSR_EEPROM_GP,
-                             iwl_read32(priv, CSR_EEPROM_GP) &
-                             ~CSR_EEPROM_GP_IF_OWNER_MSK);
+                iwl_write32(priv, CSR_EEPROM_GP,
+                            iwl_read32(priv, CSR_EEPROM_GP) &
+                            ~CSR_EEPROM_GP_IF_OWNER_MSK);
 
                 iwl_set_bit(priv, CSR_OTP_GP_REG,
                              CSR_OTP_GP_REG_ECC_CORR_STATUS_MSK |
@@ -471,8 +471,8 @@ int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)
                 for (addr = 0; addr < sz; addr += sizeof(u16)) {
                         u32 r;
 
-                        _iwl_write32(priv, CSR_EEPROM_REG,
-                                     CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
+                        iwl_write32(priv, CSR_EEPROM_REG,
+                                    CSR_EEPROM_REG_MSK_ADDR & (addr << 1));
 
                         ret = iwl_poll_bit(priv, CSR_EEPROM_REG,
                                                   CSR_EEPROM_REG_READ_VALID_MSK,
@@ -482,7 +482,7 @@ int iwl_eeprom_init(struct iwl_priv *priv, u32 hw_rev)
                                 IWL_ERR(priv, "Time out reading EEPROM[%d]\n", addr);
                                 goto done;
                         }
-                        r = _iwl_read_direct32(priv, CSR_EEPROM_REG);
+                        r = iwl_read32(priv, CSR_EEPROM_REG);
                         e[addr / 2] = cpu_to_le16(r >> 16);
                 }
         }