iwlwifi: op_mode holds its pointer to the config

[cascardo/linux.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 1993a2b..d57063e 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -71,7 +71,7 @@ static const struct ieee80211_tpt_blink iwl_blink[] = {
 /* Set led register off */
 void iwlagn_led_enable(struct iwl_priv *priv)
 {
-       iwl_write32(trans(priv), CSR_LED_REG, CSR_LED_REG_TRUN_ON);
+       iwl_write32(priv->trans, CSR_LED_REG, CSR_LED_REG_TRUN_ON);
 }
 
 /*
@@ -107,9 +107,9 @@ static int iwl_send_led_cmd(struct iwl_priv *priv, struct iwl_led_cmd *led_cmd)
        };
        u32 reg;
 
-       reg = iwl_read32(trans(priv), CSR_LED_REG);
+       reg = iwl_read32(priv->trans, CSR_LED_REG);
        if (reg != (reg & CSR_LED_BSM_CTRL_MSK))
-               iwl_write32(trans(priv), CSR_LED_REG,
+               iwl_write32(priv->trans, CSR_LED_REG,
                            reg & CSR_LED_BSM_CTRL_MSK);
 
        return iwl_dvm_send_cmd(priv, &cmd);
@@ -138,11 +138,11 @@ static int iwl_led_cmd(struct iwl_priv *priv,
        }
 
        IWL_DEBUG_LED(priv, "Led blink time compensation=%u\n",
-                       cfg(priv)->base_params->led_compensation);
+                       priv->cfg->base_params->led_compensation);
        led_cmd.on = iwl_blink_compensation(priv, on,
-                               cfg(priv)->base_params->led_compensation);
+                               priv->cfg->base_params->led_compensation);
        led_cmd.off = iwl_blink_compensation(priv, off,
-                               cfg(priv)->base_params->led_compensation);
+                               priv->cfg->base_params->led_compensation);
 
        ret = iwl_send_led_cmd(priv, &led_cmd);
        if (!ret) {
@@ -183,7 +183,7 @@ void iwl_leds_init(struct iwl_priv *priv)
                return;
        }
        if (mode == IWL_LED_DEFAULT)
-               mode = cfg(priv)->led_mode;
+               mode = priv->cfg->led_mode;
 
        priv->led.name = kasprintf(GFP_KERNEL, "%s-led",
                                   wiphy_name(priv->hw->wiphy));
@@ -207,7 +207,7 @@ void iwl_leds_init(struct iwl_priv *priv)
                break;
        }
 
-       ret = led_classdev_register(trans(priv)->dev, &priv->led);
+       ret = led_classdev_register(priv->trans->dev, &priv->led);
        if (ret) {
                kfree(priv->led.name);
                return;