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, 2 insertions, 18 deletions

diff --git a/net/irda/ircomm/ircomm_ttp.c b/net/irda/ircomm/ircomm_ttp.c
index abe9a5ab8d34..4b81e0934770 100644
--- a/net/irda/ircomm/ircomm_ttp.c
+++ b/net/irda/ircomm/ircomm_ttp.c
@@ -76,8 +76,6 @@ int ircomm_open_tsap(struct ircomm_cb *self)
 {
         notify_t notify;
 
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         /* Register callbacks */
         irda_notify_init(&notify);
         notify.data_indication       = ircomm_ttp_data_indication;
@@ -91,7 +89,7 @@ int ircomm_open_tsap(struct ircomm_cb *self)
         self->tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT,
                                      &notify);
         if (!self->tsap) {
-                IRDA_DEBUG(0, "%sfailed to allocate tsap\n", __func__ );
+                pr_debug("%sfailed to allocate tsap\n", __func__);
                 return -1;
         }
         self->slsap_sel = self->tsap->stsap_sel;
@@ -119,8 +117,6 @@ static int ircomm_ttp_connect_request(struct ircomm_cb *self,
 {
         int ret = 0;
 
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         /* Don't forget to refcount it - should be NULL anyway */
         if(userdata)
                 skb_get(userdata);
@@ -143,8 +139,6 @@ static int ircomm_ttp_connect_response(struct ircomm_cb *self,
 {
         int ret;
 
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         /* Don't forget to refcount it - should be NULL anyway */
         if(userdata)
                 skb_get(userdata);
@@ -171,7 +165,7 @@ static int ircomm_ttp_data_request(struct ircomm_cb *self,
 
         IRDA_ASSERT(skb != NULL, return -1;);
 
-        IRDA_DEBUG(2, "%s(), clen=%d\n", __func__ , clen);
+        pr_debug("%s(), clen=%d\n", __func__ , clen);
 
         /*
          * Insert clen field, currently we either send data only, or control
@@ -206,8 +200,6 @@ static int ircomm_ttp_data_indication(void *instance, void *sap,
 {
         struct ircomm_cb *self = (struct ircomm_cb *) instance;
 
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return -1;);
         IRDA_ASSERT(skb != NULL, return -1;);
@@ -229,8 +221,6 @@ static void ircomm_ttp_connect_confirm(void *instance, void *sap,
         struct ircomm_cb *self = (struct ircomm_cb *) instance;
         struct ircomm_info info;
 
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
         IRDA_ASSERT(skb != NULL, return;);
@@ -270,8 +260,6 @@ static void ircomm_ttp_connect_indication(void *instance, void *sap,
         struct ircomm_cb *self = (struct ircomm_cb *)instance;
         struct ircomm_info info;
 
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
         IRDA_ASSERT(skb != NULL, return;);
@@ -329,8 +317,6 @@ static void ircomm_ttp_disconnect_indication(void *instance, void *sap,
         struct ircomm_cb *self = (struct ircomm_cb *) instance;
         struct ircomm_info info;
 
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);
 
@@ -354,8 +340,6 @@ static void ircomm_ttp_flow_indication(void *instance, void *sap,
 {
         struct ircomm_cb *self = (struct ircomm_cb *) instance;
 
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_MAGIC, return;);