Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

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

diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
index 4b69da30665c3b1bd74c93f0dd516aaf4e89809e..2ad9faf1508a702e23462891355abdfc07cf69c7 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2008 Intel Corporation. All rights reserved.
+ * Copyright(c) 2003 - 2009 Intel Corporation. All rights reserved.
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -47,7 +47,7 @@ static int iwl_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                return 0;
 
-       IWL_DEBUG_RF_KILL("we received soft RFKILL set to state %d\n", state);
+       IWL_DEBUG_RF_KILL(priv, "we received soft RFKILL set to state %d\n", state);
        mutex_lock(&priv->mutex);
 
        switch (state) {
@@ -62,7 +62,8 @@ static int iwl_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
                iwl_radio_kill_sw_disable_radio(priv);
                break;
        default:
-               IWL_WARNING("we received unexpected RFKILL state %d\n", state);
+               IWL_WARN(priv, "we received unexpected RFKILL state %d\n",
+                       state);
                break;
        }
 out_unlock:
@@ -78,10 +79,10 @@ int iwl_rfkill_init(struct iwl_priv *priv)
 
        BUG_ON(device == NULL);
 
-       IWL_DEBUG_RF_KILL("Initializing RFKILL.\n");
+       IWL_DEBUG_RF_KILL(priv, "Initializing RFKILL.\n");
        priv->rfkill = rfkill_allocate(device, RFKILL_TYPE_WLAN);
        if (!priv->rfkill) {
-               IWL_ERROR("Unable to allocate RFKILL device.\n");
+               IWL_ERR(priv, "Unable to allocate RFKILL device.\n");
                ret = -ENOMEM;
                goto error;
        }
@@ -97,11 +98,11 @@ int iwl_rfkill_init(struct iwl_priv *priv)
 
        ret = rfkill_register(priv->rfkill);
        if (ret) {
-               IWL_ERROR("Unable to register RFKILL: %d\n", ret);
+               IWL_ERR(priv, "Unable to register RFKILL: %d\n", ret);
                goto free_rfkill;
        }
 
-       IWL_DEBUG_RF_KILL("RFKILL initialization complete.\n");
+       IWL_DEBUG_RF_KILL(priv, "RFKILL initialization complete.\n");
        return ret;
 
 free_rfkill:
@@ -110,7 +111,7 @@ free_rfkill:
        priv->rfkill = NULL;
 
 error:
-       IWL_DEBUG_RF_KILL("RFKILL initialization complete.\n");
+       IWL_DEBUG_RF_KILL(priv, "RFKILL initialization complete.\n");
        return ret;
 }
 EXPORT_SYMBOL(iwl_rfkill_init);