iwlwifi: rename iwl-4965-io.h to iwl-io.h

This patch renames iwl-4965-io.h back to iw-io.h
it also remove 4965 from all functions it supplies

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c
index 6f5424bd365b..d59ad1844e25 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -40,6 +40,7 @@
 #include <asm/unaligned.h>
 
 #include "iwl-4965.h"
+#include "iwl-io.h"
 #include "iwl-core.h"
 #include "iwl-helpers.h"
 
@@ -85,9 +86,9 @@ static int iwl_send_led_cmd(struct iwl_priv *priv,
         };
         u32 reg;
 
-        reg = iwl4965_read32(priv, CSR_LED_REG);
+        reg = iwl_read32(priv, CSR_LED_REG);
         if (reg != (reg & CSR_LED_BSM_CTRL_MSK))
-                iwl4965_write32(priv, CSR_LED_REG, reg & CSR_LED_BSM_CTRL_MSK);
+                iwl_write32(priv, CSR_LED_REG, reg & CSR_LED_BSM_CTRL_MSK);
 
         return iwl_send_cmd(priv, &cmd);
 }
@@ -126,7 +127,7 @@ static int iwl4965_led_pattern(struct iwl_priv *priv, int led_id,
 static int iwl4965_led_on_reg(struct iwl_priv *priv, int led_id)
 {
         IWL_DEBUG_LED("led on %d\n", led_id);
-        iwl4965_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_ON);
+        iwl_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_ON);
         return 0;
 }
 
@@ -150,7 +151,7 @@ int iwl4965_led_off(struct iwl_priv *priv, int led_id)
 static int iwl4965_led_off_reg(struct iwl_priv *priv, int led_id)
 {
         IWL_DEBUG_LED("radio off\n");
-        iwl4965_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_OFF);
+        iwl_write32(priv, CSR_LED_REG, CSR_LED_REG_TRUN_OFF);
         return 0;
 }