irda: Convert IRDA_DEBUG to pr_debug

Use the normal kernel debugging mechanism which also
enables dynamic_debug at the same time.

Other miscellanea:

o Remove sysctl for irda_debug
o Remove function tracing like uses (use ftrace instead)
o Coalesce formats
o Realign arguments
o Remove unnecessary OOM messages

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 30 insertions, 65 deletions

diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index 11b0a5ed0252..40695b9751c1 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -174,8 +174,6 @@ static int __init ircomm_tty_init(void)
 
 static void __exit __ircomm_tty_cleanup(struct ircomm_tty_cb *self)
 {
-        IRDA_DEBUG(0, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
@@ -196,8 +194,6 @@ static void __exit ircomm_tty_cleanup(void)
 {
         int ret;
 
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         ret = tty_unregister_driver(driver);
         if (ret) {
                 net_err_ratelimited("%s(), failed to unregister driver\n",
@@ -220,14 +216,12 @@ static int ircomm_tty_startup(struct ircomm_tty_cb *self)
         notify_t notify;
         int ret = -ENODEV;
 
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
 
         /* Check if already open */
         if (test_and_set_bit(ASYNCB_INITIALIZED, &self->port.flags)) {
-                IRDA_DEBUG(2, "%s(), already open so break out!\n", __func__ );
+                pr_debug("%s(), already open so break out!\n", __func__);
                 return 0;
         }
 
@@ -282,8 +276,6 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
         int             do_clocal = 0;
         unsigned long   flags;
 
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
         /*
          * If non-blocking mode is set, or the port is not enabled,
          * then make the check up front and then exit.
@@ -298,12 +290,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
                 if (tty->termios.c_cflag & CBAUD)
                         tty_port_raise_dtr_rts(port);
                 port->flags |= ASYNC_NORMAL_ACTIVE;
-                IRDA_DEBUG(1, "%s(), O_NONBLOCK requested!\n", __func__ );
+                pr_debug("%s(), O_NONBLOCK requested!\n", __func__);
                 return 0;
         }
 
         if (tty->termios.c_cflag & CLOCAL) {
-                IRDA_DEBUG(1, "%s(), doing CLOCAL!\n", __func__ );
+                pr_debug("%s(), doing CLOCAL!\n", __func__);
                 do_clocal = 1;
         }
 
@@ -317,8 +309,8 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
         retval = 0;
         add_wait_queue(&port->open_wait, &wait);
 
-        IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
-              __FILE__, __LINE__, tty->driver->name, port->count);
+        pr_debug("%s(%d):block_til_ready before block on %s open_count=%d\n",
+                 __FILE__, __LINE__, tty->driver->name, port->count);
 
         spin_lock_irqsave(&port->lock, flags);
         port->count--;
@@ -355,8 +347,8 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
                         break;
                 }
 
-                IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
-                      __FILE__, __LINE__, tty->driver->name, port->count);
+                pr_debug("%s(%d):block_til_ready blocking on %s open_count=%d\n",
+                         __FILE__, __LINE__, tty->driver->name, port->count);
 
                 schedule();
         }
@@ -370,8 +362,8 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
         port->blocked_open--;
         spin_unlock_irqrestore(&port->lock, flags);
 
-        IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
-              __FILE__, __LINE__, tty->driver->name, port->count);
+        pr_debug("%s(%d):block_til_ready after blocking on %s open_count=%d\n",
+                 __FILE__, __LINE__, tty->driver->name, port->count);
 
         if (!retval)
                 port->flags |= ASYNC_NORMAL_ACTIVE;
@@ -439,16 +431,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
         unsigned long   flags;
         int ret;
 
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
         /* ++ is not atomic, so this should be protected - Jean II */
         spin_lock_irqsave(&self->port.lock, flags);
         self->port.count++;
         spin_unlock_irqrestore(&self->port.lock, flags);
         tty_port_tty_set(&self->port, tty);
 
-        IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
-                   self->line, self->port.count);
+        pr_debug("%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
+                 self->line, self->port.count);
 
         /* Not really used by us, but lets do it anyway */
         self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
@@ -487,9 +477,9 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
                 self->settings.service_type = IRCOMM_9_WIRE; /* 9 wire as default */
                 /* Jan Kiszka -> add DSR/RI -> Conform to IrCOMM spec */
                 self->settings.dce = IRCOMM_CTS | IRCOMM_CD | IRCOMM_DSR | IRCOMM_RI; /* Default line settings */
-                IRDA_DEBUG(2, "%s(), IrCOMM device\n", __func__ );
+                pr_debug("%s(), IrCOMM device\n", __func__);
         } else {
-                IRDA_DEBUG(2, "%s(), IrLPT device\n", __func__ );
+                pr_debug("%s(), IrLPT device\n", __func__);
                 self->service_type = IRCOMM_3_WIRE_RAW;
                 self->settings.service_type = IRCOMM_3_WIRE_RAW; /* Default */
         }
@@ -500,9 +490,8 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
 
         ret = ircomm_tty_block_til_ready(self, tty, filp);
         if (ret) {
-                IRDA_DEBUG(2,
-                      "%s(), returning after block_til_ready with %d\n", __func__ ,
-                      ret);
+                pr_debug("%s(), returning after block_til_ready with %d\n",
+                         __func__, ret);
 
                 return ret;
         }
@@ -520,8 +509,6 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
         struct tty_port *port = &self->port;
 
-        IRDA_DEBUG(0, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
@@ -571,8 +558,6 @@ static void ircomm_tty_do_softint(struct work_struct *work)
         unsigned long flags;
         struct sk_buff *skb, *ctrl_skb;
 
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
         if (!self || self->magic != IRCOMM_TTY_MAGIC)
                 return;
 
@@ -638,8 +623,8 @@ static int ircomm_tty_write(struct tty_struct *tty,
         int len = 0;
         int size;
 
-        IRDA_DEBUG(2, "%s(), count=%d, hw_stopped=%d\n", __func__ , count,
-                   tty->hw_stopped);
+        pr_debug("%s(), count=%d, hw_stopped=%d\n", __func__ , count,
+                 tty->hw_stopped);
 
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
@@ -661,7 +646,7 @@ static int ircomm_tty_write(struct tty_struct *tty,
          * we don't mess up the original "safe skb" (see tx_data_size).
          * Jean II */
         if (self->max_header_size == IRCOMM_TTY_HDR_UNINITIALISED) {
-                IRDA_DEBUG(1, "%s() : not initialised\n", __func__);
+                pr_debug("%s() : not initialised\n", __func__);
 #ifdef IRCOMM_NO_TX_BEFORE_INIT
                 /* We didn't consume anything, TTY will retry */
                 return 0;
@@ -790,7 +775,7 @@ static int ircomm_tty_write_room(struct tty_struct *tty)
                         ret = self->max_data_size;
                 spin_unlock_irqrestore(&self->spinlock, flags);
         }
-        IRDA_DEBUG(2, "%s(), ret=%d\n", __func__ , ret);
+        pr_debug("%s(), ret=%d\n", __func__ , ret);
 
         return ret;
 }
@@ -807,8 +792,6 @@ static void ircomm_tty_wait_until_sent(struct tty_struct *tty, int timeout)
         unsigned long orig_jiffies, poll_time;
         unsigned long flags;
 
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
@@ -842,8 +825,6 @@ static void ircomm_tty_throttle(struct tty_struct *tty)
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
 
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
@@ -873,8 +854,6 @@ static void ircomm_tty_unthrottle(struct tty_struct *tty)
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
 
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
@@ -888,7 +867,7 @@ static void ircomm_tty_unthrottle(struct tty_struct *tty)
                 self->settings.dte |= (IRCOMM_RTS|IRCOMM_DELTA_RTS);
 
                 ircomm_param_request(self, IRCOMM_DTE, TRUE);
-                IRDA_DEBUG(1, "%s(), FLOW_START\n", __func__ );
+                pr_debug("%s(), FLOW_START\n", __func__);
         }
         ircomm_flow_request(self->ircomm, FLOW_START);
 }
@@ -925,8 +904,6 @@ static void ircomm_tty_shutdown(struct ircomm_tty_cb *self)
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
-        IRDA_DEBUG(0, "%s()\n", __func__ );
-
         if (!test_and_clear_bit(ASYNCB_INITIALIZED, &self->port.flags))
                 return;
 
@@ -969,8 +946,6 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
         struct tty_port *port = &self->port;
         unsigned long   flags;
 
-        IRDA_DEBUG(0, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
@@ -998,7 +973,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
  */
 static void ircomm_tty_send_xchar(struct tty_struct *tty, char ch)
 {
-        IRDA_DEBUG(0, "%s(), not impl\n", __func__ );
+        pr_debug("%s(), not impl\n", __func__);
 }
 
 /*
@@ -1042,8 +1017,6 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
         struct tty_struct *tty;
         int status;
 
-        IRDA_DEBUG(0, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
@@ -1055,15 +1028,13 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
                 /*wake_up_interruptible(&self->delta_msr_wait);*/
         }
         if ((self->port.flags & ASYNC_CHECK_CD) && (status & IRCOMM_DELTA_CD)) {
-                IRDA_DEBUG(2,
-                           "%s(), ircomm%d CD now %s...\n", __func__ , self->line,
-                           (status & IRCOMM_CD) ? "on" : "off");
+                pr_debug("%s(), ircomm%d CD now %s...\n", __func__ , self->line,
+                         (status & IRCOMM_CD) ? "on" : "off");
 
                 if (status & IRCOMM_CD) {
                         wake_up_interruptible(&self->port.open_wait);
                 } else {
-                        IRDA_DEBUG(2,
-                                   "%s(), Doing serial hangup..\n", __func__ );
+                        pr_debug("%s(), Doing serial hangup..\n", __func__);
                         if (tty)
                                 tty_hangup(tty);
 
@@ -1074,8 +1045,7 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
         if (tty && tty_port_cts_enabled(&self->port)) {
                 if (tty->hw_stopped) {
                         if (status & IRCOMM_CTS) {
-                                IRDA_DEBUG(2,
-                                           "%s(), CTS tx start...\n", __func__ );
+                                pr_debug("%s(), CTS tx start...\n", __func__);
                                 tty->hw_stopped = 0;
 
                                 /* Wake up processes blocked on open */
@@ -1086,8 +1056,7 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
                         }
                 } else {
                         if (!(status & IRCOMM_CTS)) {
-                                IRDA_DEBUG(2,
-                                           "%s(), CTS tx stop...\n", __func__ );
+                                pr_debug("%s(), CTS tx stop...\n", __func__);
                                 tty->hw_stopped = 1;
                         }
                 }
@@ -1108,15 +1077,13 @@ static int ircomm_tty_data_indication(void *instance, void *sap,
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
         struct tty_struct *tty;
 
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
         IRDA_ASSERT(skb != NULL, return -1;);
 
         tty = tty_port_tty_get(&self->port);
         if (!tty) {
-                IRDA_DEBUG(0, "%s(), no tty!\n", __func__ );
+                pr_debug("%s(), no tty!\n", __func__);
                 return 0;
         }
 
@@ -1127,7 +1094,7 @@ static int ircomm_tty_data_indication(void *instance, void *sap,
          * params, we can just as well declare the hardware for running.
          */
         if (tty->hw_stopped && (self->flow == FLOW_START)) {
-                IRDA_DEBUG(0, "%s(), polling for line settings!\n", __func__ );
+                pr_debug("%s(), polling for line settings!\n", __func__);
                 ircomm_param_request(self, IRCOMM_POLL, TRUE);
 
                 /* We can just as well declare the hardware for running */
@@ -1160,8 +1127,6 @@ static int ircomm_tty_control_indication(void *instance, void *sap,
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
         int clen;
 
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
         IRDA_ASSERT(skb != NULL, return -1;);
@@ -1196,7 +1161,7 @@ static void ircomm_tty_flow_indication(void *instance, void *sap,
 
         switch (cmd) {
         case FLOW_START:
-                IRDA_DEBUG(2, "%s(), hw start!\n", __func__ );
+                pr_debug("%s(), hw start!\n", __func__);
                 if (tty)
                         tty->hw_stopped = 0;
 
@@ -1205,7 +1170,7 @@ static void ircomm_tty_flow_indication(void *instance, void *sap,
                 break;
         default:  /* If we get here, something is very wrong, better stop */
         case FLOW_STOP:
-                IRDA_DEBUG(2, "%s(), hw stopped!\n", __func__ );
+                pr_debug("%s(), hw stopped!\n", __func__);
                 if (tty)
                         tty->hw_stopped = 1;
                 break;