Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

1 files changed, 11 insertions, 13 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 189744db65e0..90dc14336980 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -171,7 +171,7 @@ static void rt2x00lib_autowakeup(struct work_struct *work)
                 return;
 
         if (rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_AWAKE))
-                ERROR(rt2x00dev, "Device failed to wakeup.\n");
+                rt2x00_err(rt2x00dev, "Device failed to wakeup\n");
         clear_bit(CONFIG_POWERSAVING, &rt2x00dev->flags);
 }
 
@@ -673,9 +673,8 @@ static int rt2x00lib_rxdone_read_signal(struct rt2x00_dev *rt2x00dev,
                 break;
         }
 
-        WARNING(rt2x00dev, "Frame received with unrecognized signal, "
-                "mode=0x%.4x, signal=0x%.4x, type=%d.\n",
-                rxdesc->rate_mode, signal, type);
+        rt2x00_warn(rt2x00dev, "Frame received with unrecognized signal, mode=0x%.4x, signal=0x%.4x, type=%d\n",
+                    rxdesc->rate_mode, signal, type);
         return 0;
 }
 
@@ -720,8 +719,8 @@ void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp)
          */
         if (unlikely(rxdesc.size == 0 ||
                      rxdesc.size > entry->queue->data_size)) {
-                ERROR(rt2x00dev, "Wrong frame size %d max %d.\n",
-                        rxdesc.size, entry->queue->data_size);
+                rt2x00_err(rt2x00dev, "Wrong frame size %d max %d\n",
+                           rxdesc.size, entry->queue->data_size);
                 dev_kfree_skb(entry->skb);
                 goto renew_skb;
         }
@@ -1006,7 +1005,7 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
 
  exit_free_channels:
         kfree(channels);
-        ERROR(rt2x00dev, "Allocation ieee80211 modes failed.\n");
+        rt2x00_err(rt2x00dev, "Allocation ieee80211 modes failed\n");
         return -ENOMEM;
 }
 
@@ -1337,7 +1336,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
          */
         retval = rt2x00dev->ops->lib->probe_hw(rt2x00dev);
         if (retval) {
-                ERROR(rt2x00dev, "Failed to allocate device.\n");
+                rt2x00_err(rt2x00dev, "Failed to allocate device\n");
                 goto exit;
         }
 
@@ -1353,7 +1352,7 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
          */
         retval = rt2x00lib_probe_hw(rt2x00dev);
         if (retval) {
-                ERROR(rt2x00dev, "Failed to initialize hw.\n");
+                rt2x00_err(rt2x00dev, "Failed to initialize hw\n");
                 goto exit;
         }
 
@@ -1451,7 +1450,7 @@ EXPORT_SYMBOL_GPL(rt2x00lib_remove_dev);
 #ifdef CONFIG_PM
 int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
 {
-        DEBUG(rt2x00dev, "Going to sleep.\n");
+        rt2x00_dbg(rt2x00dev, "Going to sleep\n");
 
         /*
          * Prevent mac80211 from accessing driver while suspended.
@@ -1482,8 +1481,7 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
          * device is as good as disabled.
          */
         if (rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_SLEEP))
-                WARNING(rt2x00dev, "Device failed to enter sleep state, "
-                        "continue suspending.\n");
+                rt2x00_warn(rt2x00dev, "Device failed to enter sleep state, continue suspending\n");
 
         return 0;
 }
@@ -1491,7 +1489,7 @@ EXPORT_SYMBOL_GPL(rt2x00lib_suspend);
 
 int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
 {
-        DEBUG(rt2x00dev, "Waking up.\n");
+        rt2x00_dbg(rt2x00dev, "Waking up\n");
 
         /*
          * Restore/enable extra components.