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, 11 insertions, 11 deletions

diff --git a/net/irda/wrapper.c b/net/irda/wrapper.c
index 9efffeb8d0f1..40a0f993bf13 100644
--- a/net/irda/wrapper.c
+++ b/net/irda/wrapper.c
@@ -106,17 +106,17 @@ int async_wrap_skb(struct sk_buff *skb, __u8 *tx_buff, int buffsize)
                  * Nothing to worry about, but we set the default number of
                  * BOF's
                  */
-                IRDA_DEBUG(1, "%s(), wrong magic in skb!\n", __func__);
+                pr_debug("%s(), wrong magic in skb!\n", __func__);
                 xbofs = 10;
         } else
                 xbofs = cb->xbofs + cb->xbofs_delay;
 
-        IRDA_DEBUG(4, "%s(), xbofs=%d\n", __func__, xbofs);
+        pr_debug("%s(), xbofs=%d\n", __func__, xbofs);
 
         /* Check that we never use more than 115 + 48 xbofs */
         if (xbofs > 163) {
-                IRDA_DEBUG(0, "%s(), too many xbofs (%d)\n", __func__,
-                           xbofs);
+                pr_debug("%s(), too many xbofs (%d)\n", __func__,
+                         xbofs);
                 xbofs = 163;
         }
 
@@ -286,8 +286,8 @@ async_unwrap_bof(struct net_device *dev,
         case INSIDE_FRAME:
                 /* Not supposed to happen, the previous frame is not
                  * finished - Jean II */
-                IRDA_DEBUG(1, "%s(), Discarding incomplete frame\n",
-                           __func__);
+                pr_debug("%s(), Discarding incomplete frame\n",
+                         __func__);
                 stats->rx_errors++;
                 stats->rx_missed_errors++;
                 irda_device_set_media_busy(dev, TRUE);
@@ -360,7 +360,7 @@ async_unwrap_eof(struct net_device *dev,
                         /* Wrong CRC, discard frame!  */
                         irda_device_set_media_busy(dev, TRUE);
 
-                        IRDA_DEBUG(1, "%s(), crc error\n", __func__);
+                        pr_debug("%s(), crc error\n", __func__);
                         stats->rx_errors++;
                         stats->rx_crc_errors++;
                 }
@@ -420,8 +420,8 @@ async_unwrap_other(struct net_device *dev,
                         rx_buff->fcs = irda_fcs(rx_buff->fcs, byte);
 #endif
                 } else {
-                        IRDA_DEBUG(1, "%s(), Rx buffer overflow, aborting\n",
-                                   __func__);
+                        pr_debug("%s(), Rx buffer overflow, aborting\n",
+                                 __func__);
                         rx_buff->state = OUTSIDE_FRAME;
                 }
                 break;
@@ -439,8 +439,8 @@ async_unwrap_other(struct net_device *dev,
 #endif
                         rx_buff->state = INSIDE_FRAME;
                 } else {
-                        IRDA_DEBUG(1, "%s(), Rx buffer overflow, aborting\n",
-                                   __func__);
+                        pr_debug("%s(), Rx buffer overflow, aborting\n",
+                                 __func__);
                         rx_buff->state = OUTSIDE_FRAME;
                 }
                 break;