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

diff --git a/net/irda/irqueue.c b/net/irda/irqueue.c
index 7152624ed5f1..acbe61c7e683 100644
--- a/net/irda/irqueue.c
+++ b/net/irda/irqueue.c
@@ -233,8 +233,6 @@ static __u32 hash( const char* name)
 static void enqueue_first(irda_queue_t **queue, irda_queue_t* element)
 {
 
-        IRDA_DEBUG( 4, "%s()\n", __func__);
-
         /*
          * Check if queue is empty.
          */
@@ -267,7 +265,7 @@ static irda_queue_t *dequeue_first(irda_queue_t **queue)
 {
         irda_queue_t *ret;
 
-        IRDA_DEBUG( 4, "dequeue_first()\n");
+        pr_debug("dequeue_first()\n");
 
         /*
          * Set return value
@@ -308,7 +306,7 @@ static irda_queue_t *dequeue_general(irda_queue_t **queue, irda_queue_t* element
 {
         irda_queue_t *ret;
 
-        IRDA_DEBUG( 4, "dequeue_general()\n");
+        pr_debug("dequeue_general()\n");
 
         /*
          * Set return value
@@ -452,8 +450,6 @@ void hashbin_insert(hashbin_t* hashbin, irda_queue_t* entry, long hashv,
         unsigned long flags = 0;
         int bin;
 
-        IRDA_DEBUG( 4, "%s()\n", __func__);
-
         IRDA_ASSERT( hashbin != NULL, return;);
         IRDA_ASSERT( hashbin->magic == HB_MAGIC, return;);
 
@@ -565,8 +561,6 @@ void* hashbin_remove( hashbin_t* hashbin, long hashv, const char* name)
         unsigned long flags = 0;
         irda_queue_t* entry;
 
-        IRDA_DEBUG( 4, "%s()\n", __func__);
-
         IRDA_ASSERT( hashbin != NULL, return NULL;);
         IRDA_ASSERT( hashbin->magic == HB_MAGIC, return NULL;);
 
@@ -658,8 +652,6 @@ void* hashbin_remove_this( hashbin_t* hashbin, irda_queue_t* entry)
         int     bin;
         long    hashv;
 
-        IRDA_DEBUG( 4, "%s()\n", __func__);
-
         IRDA_ASSERT( hashbin != NULL, return NULL;);
         IRDA_ASSERT( hashbin->magic == HB_MAGIC, return NULL;);
         IRDA_ASSERT( entry != NULL, return NULL;);
@@ -719,7 +711,7 @@ void* hashbin_find( hashbin_t* hashbin, long hashv, const char* name )
         int bin;
         irda_queue_t* entry;
 
-        IRDA_DEBUG( 4, "hashbin_find()\n");
+        pr_debug("hashbin_find()\n");
 
         IRDA_ASSERT( hashbin != NULL, return NULL;);
         IRDA_ASSERT( hashbin->magic == HB_MAGIC, return NULL;);