Merge git://git.infradead.org/battery-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / iwlwifi / iwl-led.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c
index 6f5424bd365bb8f9222557c85d0603d1b9a73f7f..03fdf5b434a13de415e957a51237e3985ee99d82 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -41,6 +41,7 @@
 
 #include "iwl-4965.h"
 #include "iwl-core.h"
+#include "iwl-io.h"
 #include "iwl-helpers.h"
 
 #define IWL_1MB_RATE (128 * 1024)
@@ -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;
 }
 
@@ -237,18 +238,20 @@ static int iwl_leds_register_led(struct iwl_priv *priv,
        led->led_dev.brightness_set = iwl4965_led_brightness_set;
        led->led_dev.default_trigger = trigger;
 
+       led->priv = priv;
+       led->type = type;
+
        ret = led_classdev_register(device, &led->led_dev);
        if (ret) {
                IWL_ERROR("Error: failed to register led handler.\n");
                return ret;
        }
 
-       led->priv = priv;
-       led->type = type;
        led->registered = 1;
 
        if (set_led && led->led_on)
                led->led_on(priv, IWL_LED_LINK);
+
        return 0;
 }