Merge tag 'modules-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...

[karo-tx-linux.git] / net / irda / iriap_event.c

diff --git a/net/irda/iriap_event.c b/net/irda/iriap_event.c
index 703774e29e322966ec4de6cf990bbc427c3ff221..e6098b2e048a3c1f308b839e7aa2cbc0796cbabc 100644 (file)
--- 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__);
 }
 
 /**************************************************************************
@@ -368,10 +368,8 @@ static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
        switch (event) {
        case IAP_LM_CONNECT_INDICATION:
                tx_skb = alloc_skb(LMP_MAX_HEADER, GFP_ATOMIC);
-               if (tx_skb == NULL) {
-                       IRDA_WARNING("%s: unable to malloc!\n", __func__);
+               if (tx_skb == NULL)
                        return;
-               }
 
                /* Reserve space for MUX_CONTROL and LAP header */
                skb_reserve(tx_skb, LMP_MAX_HEADER);
@@ -388,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;
        }
 }
@@ -399,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 */
@@ -408,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;
        }
 }
@@ -423,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__);
 }
 
 /*
@@ -441,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);
@@ -450,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;
        }
 }
@@ -464,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;);
@@ -485,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;
        }
 }
@@ -493,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: