1 files changed, 13 insertions, 21 deletions

diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c
index 9e0d909390fd..856736656a30 100644
--- a/net/irda/irda_device.c
+++ b/net/irda/irda_device.c
@@ -63,14 +63,14 @@ int __init irda_device_init( void)
 {
         dongles = hashbin_new(HB_NOLOCK);
         if (dongles == NULL) {
-                IRDA_WARNING("IrDA: Can't allocate dongles hashbin!\n");
+                net_warn_ratelimited("IrDA: Can't allocate dongles hashbin!\n");
                 return -ENOMEM;
         }
         spin_lock_init(&dongles->hb_spinlock);
 
         tasks = hashbin_new(HB_LOCK);
         if (tasks == NULL) {
-                IRDA_WARNING("IrDA: Can't allocate tasks hashbin!\n");
+                net_warn_ratelimited("IrDA: Can't allocate tasks hashbin!\n");
                 hashbin_delete(dongles, NULL);
                 return -ENOMEM;
         }
@@ -84,14 +84,12 @@ int __init irda_device_init( void)
 static void leftover_dongle(void *arg)
 {
         struct dongle_reg *reg = arg;
-        IRDA_WARNING("IrDA: Dongle type %x not unregistered\n",
-                     reg->type);
+        net_warn_ratelimited("IrDA: Dongle type %x not unregistered\n",
+                             reg->type);
 }
 
 void irda_device_cleanup(void)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__);
-
         hashbin_delete(tasks, (FREE_FUNC) __irda_task_delete);
 
         hashbin_delete(dongles, leftover_dongle);
@@ -107,7 +105,7 @@ void irda_device_set_media_busy(struct net_device *dev, int status)
 {
         struct irlap_cb *self;
 
-        IRDA_DEBUG(4, "%s(%s)\n", __func__, status ? "TRUE" : "FALSE");
+        pr_debug("%s(%s)\n", __func__, status ? "TRUE" : "FALSE");
 
         self = (struct irlap_cb *) dev->atalk_ptr;
 
@@ -127,7 +125,7 @@ void irda_device_set_media_busy(struct net_device *dev, int status)
                         irlap_start_mbusy_timer(self, SMALLBUSY_TIMEOUT);
                 else
                         irlap_start_mbusy_timer(self, MEDIABUSY_TIMEOUT);
-                IRDA_DEBUG( 4, "Media busy!\n");
+                pr_debug("Media busy!\n");
         } else {
                 self->media_busy = FALSE;
                 irlap_stop_mbusy_timer(self);
@@ -147,11 +145,9 @@ int irda_device_is_receiving(struct net_device *dev)
         struct if_irda_req req;
         int ret;
 
-        IRDA_DEBUG(2, "%s()\n", __func__);
-
         if (!dev->netdev_ops->ndo_do_ioctl) {
-                IRDA_ERROR("%s: do_ioctl not impl. by device driver\n",
-                           __func__);
+                net_err_ratelimited("%s: do_ioctl not impl. by device driver\n",
+                                    __func__);
                 return -1;
         }
 
@@ -192,8 +188,6 @@ static int irda_task_kick(struct irda_task *task)
         int count = 0;
         int timeout;
 
-        IRDA_DEBUG(2, "%s()\n", __func__);
-
         IRDA_ASSERT(task != NULL, return -1;);
         IRDA_ASSERT(task->magic == IRDA_TASK_MAGIC, return -1;);
 
@@ -201,15 +195,15 @@ static int irda_task_kick(struct irda_task *task)
         do {
                 timeout = task->function(task);
                 if (count++ > 100) {
-                        IRDA_ERROR("%s: error in task handler!\n",
-                                   __func__);
+                        net_err_ratelimited("%s: error in task handler!\n",
+                                            __func__);
                         irda_task_delete(task);
                         return TRUE;
                 }
         } while ((timeout == 0) && (task->state != IRDA_TASK_DONE));
 
         if (timeout < 0) {
-                IRDA_ERROR("%s: Error executing task!\n", __func__);
+                net_err_ratelimited("%s: Error executing task!\n", __func__);
                 irda_task_delete(task);
                 return TRUE;
         }
@@ -241,8 +235,8 @@ static int irda_task_kick(struct irda_task *task)
                                  irda_task_timer_expired);
                 finished = FALSE;
         } else {
-                IRDA_DEBUG(0, "%s(), not finished, and no timeout!\n",
-                           __func__);
+                pr_debug("%s(), not finished, and no timeout!\n",
+                         __func__);
                 finished = FALSE;
         }
 
@@ -259,8 +253,6 @@ static void irda_task_timer_expired(void *data)
 {
         struct irda_task *task;
 
-        IRDA_DEBUG(2, "%s()\n", __func__);
-
         task = data;
 
         irda_task_kick(task);