Merge tag 'remove-local-timers' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / net / wireless / ath / ath9k / wmi.c

diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c
index 35422fc1f2ce1a566ce11cb0a0d740880531badd..65c8894c5f81040361fbdd5da9aa7823e6d38900 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/wmi.c
+++ b/drivers/net/wireless/ath/ath9k/wmi.c
@@ -187,7 +187,7 @@ void ath9k_fatal_work(struct work_struct *work)
                                                   fatal_work);
        struct ath_common *common = ath9k_hw_common(priv->ah);
 
-       ath_dbg(common, ATH_DBG_FATAL, "FATAL Event received, resetting device\n");
+       ath_dbg(common, FATAL, "FATAL Event received, resetting device\n");
        ath9k_htc_reset(priv);
 }
 
@@ -330,8 +330,7 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,
 
        time_left = wait_for_completion_timeout(&wmi->cmd_wait, timeout);
        if (!time_left) {
-               ath_dbg(common, ATH_DBG_WMI,
-                       "Timeout waiting for WMI command: %s\n",
+               ath_dbg(common, WMI, "Timeout waiting for WMI command: %s\n",
                        wmi_cmd_to_name(cmd_id));
                mutex_unlock(&wmi->op_mutex);
                return -ETIMEDOUT;
@@ -342,8 +341,7 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id,
        return 0;
 
 out:
-       ath_dbg(common, ATH_DBG_WMI,
-               "WMI failure for: %s\n", wmi_cmd_to_name(cmd_id));
+       ath_dbg(common, WMI, "WMI failure for: %s\n", wmi_cmd_to_name(cmd_id));
        mutex_unlock(&wmi->op_mutex);
        kfree_skb(skb);