1 files changed, 16 insertions, 22 deletions

diff --git a/net/irda/iriap_event.c b/net/irda/iriap_event.c
index 09de4efc73a7..e6098b2e048a 100644
--- a/net/irda/iriap_event.c
+++ b/net/irda/iriap_event.c
@@ -187,7 +187,7 @@ static void state_s_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
         case IAP_LM_DISCONNECT_INDICATION:
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), Unknown event %d\n", __func__, event);
+                pr_debug("%s(), Unknown event %d\n", __func__, event);
                 break;
         }
 }
@@ -219,7 +219,7 @@ static void state_s_connecting(struct iriap_cb *self, IRIAP_EVENT event,
                 iriap_next_client_state(self, S_DISCONNECT);
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), Unknown event %d\n", __func__, event);
+                pr_debug("%s(), Unknown event %d\n", __func__, event);
                 break;
         }
 }
@@ -243,7 +243,7 @@ static void state_s_call(struct iriap_cb *self, IRIAP_EVENT event,
                 iriap_next_client_state(self, S_DISCONNECT);
                 break;
         default:
-                IRDA_DEBUG(0, "state_s_call: Unknown event %d\n", event);
+                pr_debug("state_s_call: Unknown event %d\n", event);
                 break;
         }
 }
@@ -271,7 +271,7 @@ static void state_s_make_call(struct iriap_cb *self, IRIAP_EVENT event,
                 iriap_next_call_state(self, S_OUTSTANDING);
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), Unknown event %d\n", __func__, event);
+                pr_debug("%s(), Unknown event %d\n", __func__, event);
                 break;
         }
 }
@@ -285,7 +285,7 @@ static void state_s_make_call(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_s_calling(struct iriap_cb *self, IRIAP_EVENT event,
                             struct sk_buff *skb)
 {
-        IRDA_DEBUG(0, "%s(), Not implemented\n", __func__);
+        pr_debug("%s(), Not implemented\n", __func__);
 }
 
 /*
@@ -307,7 +307,7 @@ static void state_s_outstanding(struct iriap_cb *self, IRIAP_EVENT event,
                 iriap_next_call_state(self, S_WAIT_FOR_CALL);
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), Unknown event %d\n", __func__, event);
+                pr_debug("%s(), Unknown event %d\n", __func__, event);
                 break;
         }
 }
@@ -320,7 +320,7 @@ static void state_s_outstanding(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_s_replying(struct iriap_cb *self, IRIAP_EVENT event,
                              struct sk_buff *skb)
 {
-        IRDA_DEBUG(0, "%s(), Not implemented\n", __func__);
+        pr_debug("%s(), Not implemented\n", __func__);
 }
 
 /*
@@ -332,7 +332,7 @@ static void state_s_replying(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_s_wait_for_call(struct iriap_cb *self, IRIAP_EVENT event,
                                   struct sk_buff *skb)
 {
-        IRDA_DEBUG(0, "%s(), Not implemented\n", __func__);
+        pr_debug("%s(), Not implemented\n", __func__);
 }
 
 
@@ -345,7 +345,7 @@ static void state_s_wait_for_call(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_s_wait_active(struct iriap_cb *self, IRIAP_EVENT event,
                                 struct sk_buff *skb)
 {
-        IRDA_DEBUG(0, "%s(), Not implemented\n", __func__);
+        pr_debug("%s(), Not implemented\n", __func__);
 }
 
 /**************************************************************************
@@ -386,7 +386,7 @@ static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
                 iriap_next_r_connect_state(self, R_RECEIVING);
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), unknown event %d\n", __func__, event);
+                pr_debug("%s(), unknown event %d\n", __func__, event);
                 break;
         }
 }
@@ -397,8 +397,6 @@ static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event,
                          struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__);
-
         switch (event) {
         case IAP_LM_DISCONNECT_INDICATION:
                 /* Abort call */
@@ -406,7 +404,7 @@ static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event,
                 iriap_next_r_connect_state(self, R_WAITING);
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), unknown event!\n", __func__);
+                pr_debug("%s(), unknown event!\n", __func__);
                 break;
         }
 }
@@ -421,13 +419,13 @@ static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_r_waiting(struct iriap_cb *self, IRIAP_EVENT event,
                             struct sk_buff *skb)
 {
-        IRDA_DEBUG(0, "%s(), Not implemented\n", __func__);
+        pr_debug("%s(), Not implemented\n", __func__);
 }
 
 static void state_r_wait_active(struct iriap_cb *self, IRIAP_EVENT event,
                                 struct sk_buff *skb)
 {
-        IRDA_DEBUG(0, "%s(), Not implemented\n", __func__);
+        pr_debug("%s(), Not implemented\n", __func__);
 }
 
 /*
@@ -439,8 +437,6 @@ static void state_r_wait_active(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event,
                               struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__);
-
         switch (event) {
         case IAP_RECV_F_LST:
                 iriap_next_r_connect_state(self, R_EXECUTE);
@@ -448,7 +444,7 @@ static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event,
                 iriap_call_indication(self, skb);
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), unknown event!\n", __func__);
+                pr_debug("%s(), unknown event!\n", __func__);
                 break;
         }
 }
@@ -462,8 +458,6 @@ static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event,
                             struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__);
-
         IRDA_ASSERT(skb != NULL, return;);
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IAS_MAGIC, return;);
@@ -483,7 +477,7 @@ static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event,
                 irlmp_data_request(self->lsap, skb);
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), unknown event!\n", __func__);
+                pr_debug("%s(), unknown event!\n", __func__);
                 break;
         }
 }
@@ -491,7 +485,7 @@ static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_r_returning(struct iriap_cb *self, IRIAP_EVENT event,
                               struct sk_buff *skb)
 {
-        IRDA_DEBUG(0, "%s(), event=%d\n", __func__, event);
+        pr_debug("%s(), event=%d\n", __func__, event);
 
         switch (event) {
         case IAP_RECV_F_LST: