Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / net / irda / irlmp_event.c

diff --git a/net/irda/irlmp_event.c b/net/irda/irlmp_event.c
index 9505a7d..e306cf2 100644 (file)
--- a/net/irda/irlmp_event.c
+++ b/net/irda/irlmp_event.c
@@ -48,8 +48,7 @@ const char *const irlsap_state[] = {
        "LSAP_SETUP_PEND",
 };
 
-#ifdef CONFIG_IRDA_DEBUG
-static const char *const irlmp_event[] = {
+static const char *const irlmp_event[] __maybe_unused = {
        "LM_CONNECT_REQUEST",
        "LM_CONNECT_CONFIRM",
        "LM_CONNECT_RESPONSE",
@@ -75,7 +74,6 @@ static const char *const irlmp_event[] = {
        "LM_LAP_DISCOVERY_CONFIRM",
        "LM_LAP_IDLE_TIMEOUT",
 };
-#endif /* CONFIG_IRDA_DEBUG */
 
 /* LAP Connection control proto declarations */
 static void irlmp_state_standby  (struct lap_cb *, IRLMP_EVENT,
@@ -120,7 +118,7 @@ static inline void irlmp_next_lap_state(struct lap_cb *self,
                                        IRLMP_STATE state)
 {
        /*
-       IRDA_DEBUG(4, "%s(), LMP LAP = %s\n", __func__, irlmp_state[state]);
+         pr_debug("%s(), LMP LAP = %s\n", __func__, irlmp_state[state]);
        */
        self->lap_state = state;
 }
@@ -130,7 +128,7 @@ static inline void irlmp_next_lsap_state(struct lsap_cb *self,
 {
        /*
        IRDA_ASSERT(self != NULL, return;);
-       IRDA_DEBUG(4, "%s(), LMP LSAP = %s\n", __func__, irlsap_state[state]);
+       pr_debug("%s(), LMP LSAP = %s\n", __func__, irlsap_state[state]);
        */
        self->lsap_state = state;
 }
@@ -142,8 +140,8 @@ int irlmp_do_lsap_event(struct lsap_cb *self, IRLMP_EVENT event,
        IRDA_ASSERT(self != NULL, return -1;);
        IRDA_ASSERT(self->magic == LMP_LSAP_MAGIC, return -1;);
 
-       IRDA_DEBUG(4, "%s(), EVENT = %s, STATE = %s\n",
-               __func__, irlmp_event[event], irlsap_state[ self->lsap_state]);
+       pr_debug("%s(), EVENT = %s, STATE = %s\n",
+                __func__, irlmp_event[event], irlsap_state[self->lsap_state]);
 
        return (*lsap_state[self->lsap_state]) (self, event, skb);
 }
@@ -160,17 +158,15 @@ void irlmp_do_lap_event(struct lap_cb *self, IRLMP_EVENT event,
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == LMP_LAP_MAGIC, return;);
 
-       IRDA_DEBUG(4, "%s(), EVENT = %s, STATE = %s\n", __func__,
-                  irlmp_event[event],
-                  irlmp_state[self->lap_state]);
+       pr_debug("%s(), EVENT = %s, STATE = %s\n", __func__,
+                irlmp_event[event],
+                irlmp_state[self->lap_state]);
 
        (*lap_state[self->lap_state]) (self, event, skb);
 }
 
 void irlmp_discovery_timer_expired(void *data)
 {
-       IRDA_DEBUG(4, "%s()\n", __func__);
-
        /* We always cleanup the log (active & passive discovery) */
        irlmp_do_expiry();
 
@@ -184,8 +180,6 @@ void irlmp_watchdog_timer_expired(void *data)
 {
        struct lsap_cb *self = (struct lsap_cb *) data;
 
-       IRDA_DEBUG(2, "%s()\n", __func__);
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == LMP_LSAP_MAGIC, return;);
 
@@ -196,8 +190,6 @@ void irlmp_idle_timer_expired(void *data)
 {
        struct lap_cb *self = (struct lap_cb *) data;
 
-       IRDA_DEBUG(2, "%s()\n", __func__);
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == LMP_LAP_MAGIC, return;);
 
@@ -256,7 +248,6 @@ irlmp_do_all_lsap_event(hashbin_t * lsap_hashbin,
 static void irlmp_state_standby(struct lap_cb *self, IRLMP_EVENT event,
                                struct sk_buff *skb)
 {
-       IRDA_DEBUG(4, "%s()\n", __func__);
        IRDA_ASSERT(self->irlap != NULL, return;);
 
        switch (event) {
@@ -276,7 +267,7 @@ static void irlmp_state_standby(struct lap_cb *self, IRLMP_EVENT event,
                irlap_connect_response(self->irlap, skb);
                break;
        case LM_LAP_CONNECT_REQUEST:
-               IRDA_DEBUG(4, "%s() LS_CONNECT_REQUEST\n", __func__);
+               pr_debug("%s() LS_CONNECT_REQUEST\n", __func__);
 
                irlmp_next_lap_state(self, LAP_U_CONNECT);
 
@@ -284,14 +275,14 @@ static void irlmp_state_standby(struct lap_cb *self, IRLMP_EVENT event,
                irlap_connect_request(self->irlap, self->daddr, NULL, 0);
                break;
        case LM_LAP_DISCONNECT_INDICATION:
-               IRDA_DEBUG(4, "%s(), Error LM_LAP_DISCONNECT_INDICATION\n",
-                          __func__);
+               pr_debug("%s(), Error LM_LAP_DISCONNECT_INDICATION\n",
+                        __func__);
 
                irlmp_next_lap_state(self, LAP_STANDBY);
                break;
        default:
-               IRDA_DEBUG(0, "%s(), Unknown event %s\n",
-                          __func__, irlmp_event[event]);
+               pr_debug("%s(), Unknown event %s\n",
+                        __func__, irlmp_event[event]);
                break;
        }
 }
@@ -306,7 +297,7 @@ static void irlmp_state_standby(struct lap_cb *self, IRLMP_EVENT event,
 static void irlmp_state_u_connect(struct lap_cb *self, IRLMP_EVENT event,
                                  struct sk_buff *skb)
 {
-       IRDA_DEBUG(2, "%s(), event=%s\n", __func__, irlmp_event[event]);
+       pr_debug("%s(), event=%s\n", __func__, irlmp_event[event]);
 
        switch (event) {
        case LM_LAP_CONNECT_INDICATION:
@@ -326,7 +317,7 @@ static void irlmp_state_u_connect(struct lap_cb *self, IRLMP_EVENT event,
                 * the lsaps may already have gone. This avoid getting stuck
                 * forever in LAP_ACTIVE state - Jean II */
                if (HASHBIN_GET_SIZE(self->lsaps) == 0) {
-                       IRDA_DEBUG(0, "%s() NO LSAPs !\n",  __func__);
+                       pr_debug("%s() NO LSAPs !\n",  __func__);
                        irlmp_start_idle_timer(self, LM_IDLE_TIMEOUT);
                }
                break;
@@ -344,12 +335,12 @@ static void irlmp_state_u_connect(struct lap_cb *self, IRLMP_EVENT event,
                 * the lsaps may already have gone. This avoid getting stuck
                 * forever in LAP_ACTIVE state - Jean II */
                if (HASHBIN_GET_SIZE(self->lsaps) == 0) {
-                       IRDA_DEBUG(0, "%s() NO LSAPs !\n",  __func__);
+                       pr_debug("%s() NO LSAPs !\n",  __func__);
                        irlmp_start_idle_timer(self, LM_IDLE_TIMEOUT);
                }
                break;
        case LM_LAP_DISCONNECT_INDICATION:
-               IRDA_DEBUG(4, "%s(), LM_LAP_DISCONNECT_INDICATION\n",  __func__);
+               pr_debug("%s(), LM_LAP_DISCONNECT_INDICATION\n",  __func__);
                irlmp_next_lap_state(self, LAP_STANDBY);
 
                /* Send disconnect event to all LSAPs using this link */
@@ -357,7 +348,7 @@ static void irlmp_state_u_connect(struct lap_cb *self, IRLMP_EVENT event,
                                        LM_LAP_DISCONNECT_INDICATION);
                break;
        case LM_LAP_DISCONNECT_REQUEST:
-               IRDA_DEBUG(4, "%s(), LM_LAP_DISCONNECT_REQUEST\n",  __func__);
+               pr_debug("%s(), LM_LAP_DISCONNECT_REQUEST\n",  __func__);
 
                /* One of the LSAP did timeout or was closed, if it was
                 * the last one, try to get out of here - Jean II */
@@ -366,7 +357,7 @@ static void irlmp_state_u_connect(struct lap_cb *self, IRLMP_EVENT event,
                }
                break;
        default:
-               IRDA_DEBUG(0, "%s(), Unknown event %s\n",
+               pr_debug("%s(), Unknown event %s\n",
                         __func__, irlmp_event[event]);
                break;
        }
@@ -381,11 +372,9 @@ static void irlmp_state_u_connect(struct lap_cb *self, IRLMP_EVENT event,
 static void irlmp_state_active(struct lap_cb *self, IRLMP_EVENT event,
                               struct sk_buff *skb)
 {
-       IRDA_DEBUG(4, "%s()\n", __func__);
-
        switch (event) {
        case LM_LAP_CONNECT_REQUEST:
-               IRDA_DEBUG(4, "%s(), LS_CONNECT_REQUEST\n", __func__);
+               pr_debug("%s(), LS_CONNECT_REQUEST\n", __func__);
 
                /*
                 * IrLAP may have a pending disconnect. We tried to close
@@ -467,7 +456,7 @@ static void irlmp_state_active(struct lap_cb *self, IRLMP_EVENT event,
                irlmp_do_expiry();
                break;
        default:
-               IRDA_DEBUG(0, "%s(), Unknown event %s\n",
+               pr_debug("%s(), Unknown event %s\n",
                         __func__, irlmp_event[event]);
                break;
        }
@@ -490,8 +479,6 @@ static int irlmp_state_disconnected(struct lsap_cb *self, IRLMP_EVENT event,
 {
        int ret = 0;
 
-       IRDA_DEBUG(4, "%s()\n", __func__);
-
        IRDA_ASSERT(self != NULL, return -1;);
        IRDA_ASSERT(self->magic == LMP_LSAP_MAGIC, return -1;);
 
@@ -505,11 +492,11 @@ static int irlmp_state_disconnected(struct lsap_cb *self, IRLMP_EVENT event,
                break;
 #endif /* CONFIG_IRDA_ULTRA */
        case LM_CONNECT_REQUEST:
-               IRDA_DEBUG(4, "%s(), LM_CONNECT_REQUEST\n", __func__);
+               pr_debug("%s(), LM_CONNECT_REQUEST\n", __func__);
 
                if (self->conn_skb) {
-                       IRDA_WARNING("%s: busy with another request!\n",
-                                    __func__);
+                       net_warn_ratelimited("%s: busy with another request!\n",
+                                            __func__);
                        return -EBUSY;
                }
                /* Don't forget to refcount it (see irlmp_connect_request()) */
@@ -525,8 +512,8 @@ static int irlmp_state_disconnected(struct lsap_cb *self, IRLMP_EVENT event,
                break;
        case LM_CONNECT_INDICATION:
                if (self->conn_skb) {
-                       IRDA_WARNING("%s: busy with another request!\n",
-                                    __func__);
+                       net_warn_ratelimited("%s: busy with another request!\n",
+                                            __func__);
                        return -EBUSY;
                }
                /* Don't forget to refcount it (see irlap_driver_rcv()) */
@@ -551,8 +538,8 @@ static int irlmp_state_disconnected(struct lsap_cb *self, IRLMP_EVENT event,
                irlmp_do_lap_event(self->lap, LM_LAP_CONNECT_REQUEST, NULL);
                break;
        default:
-               IRDA_DEBUG(1, "%s(), Unknown event %s on LSAP %#02x\n",
-                          __func__, irlmp_event[event], self->slsap_sel);
+               pr_debug("%s(), Unknown event %s on LSAP %#02x\n",
+                        __func__, irlmp_event[event], self->slsap_sel);
                break;
        }
        return ret;
@@ -570,8 +557,6 @@ static int irlmp_state_connect(struct lsap_cb *self, IRLMP_EVENT event,
        struct lsap_cb *lsap;
        int ret = 0;
 
-       IRDA_DEBUG(4, "%s()\n", __func__);
-
        IRDA_ASSERT(self != NULL, return -1;);
        IRDA_ASSERT(self->magic == LMP_LSAP_MAGIC, return -1;);
 
@@ -603,7 +588,7 @@ static int irlmp_state_connect(struct lsap_cb *self, IRLMP_EVENT event,
        case LM_WATCHDOG_TIMEOUT:
                /* May happen, who knows...
                 * Jean II */
-               IRDA_DEBUG(0, "%s() WATCHDOG_TIMEOUT!\n",  __func__);
+               pr_debug("%s() WATCHDOG_TIMEOUT!\n",  __func__);
 
                /* Disconnect, get out... - Jean II */
                self->lap = NULL;
@@ -613,8 +598,8 @@ static int irlmp_state_connect(struct lsap_cb *self, IRLMP_EVENT event,
        default:
                /* LM_LAP_DISCONNECT_INDICATION : Should never happen, we
                 * are *not* yet bound to the IrLAP link. Jean II */
-               IRDA_DEBUG(0, "%s(), Unknown event %s on LSAP %#02x\n",
-                          __func__, irlmp_event[event], self->slsap_sel);
+               pr_debug("%s(), Unknown event %s on LSAP %#02x\n",
+                        __func__, irlmp_event[event], self->slsap_sel);
                break;
        }
        return ret;
@@ -632,8 +617,6 @@ static int irlmp_state_connect_pend(struct lsap_cb *self, IRLMP_EVENT event,
        struct sk_buff *tx_skb;
        int ret = 0;
 
-       IRDA_DEBUG(4, "%s()\n", __func__);
-
        IRDA_ASSERT(self != NULL, return -1;);
        IRDA_ASSERT(self->magic == LMP_LSAP_MAGIC, return -1;);
 
@@ -642,17 +625,17 @@ static int irlmp_state_connect_pend(struct lsap_cb *self, IRLMP_EVENT event,
                /* Keep state */
                break;
        case LM_CONNECT_RESPONSE:
-               IRDA_DEBUG(0, "%s(), LM_CONNECT_RESPONSE, "
-                          "no indication issued yet\n",  __func__);
+               pr_debug("%s(), LM_CONNECT_RESPONSE, no indication issued yet\n",
+                        __func__);
                /* Keep state */
                break;
        case LM_DISCONNECT_REQUEST:
-               IRDA_DEBUG(0, "%s(), LM_DISCONNECT_REQUEST, "
-                          "not yet bound to IrLAP connection\n",  __func__);
+               pr_debug("%s(), LM_DISCONNECT_REQUEST, not yet bound to IrLAP connection\n",
+                        __func__);
                /* Keep state */
                break;
        case LM_LAP_CONNECT_CONFIRM:
-               IRDA_DEBUG(4, "%s(), LS_CONNECT_CONFIRM\n",  __func__);
+               pr_debug("%s(), LS_CONNECT_CONFIRM\n",  __func__);
                irlmp_next_lsap_state(self, LSAP_CONNECT);
 
                tx_skb = self->conn_skb;
@@ -666,7 +649,7 @@ static int irlmp_state_connect_pend(struct lsap_cb *self, IRLMP_EVENT event,
                /* Will happen in some rare cases because of a race condition.
                 * Just make sure we don't stay there forever...
                 * Jean II */
-               IRDA_DEBUG(0, "%s() WATCHDOG_TIMEOUT!\n",  __func__);
+               pr_debug("%s() WATCHDOG_TIMEOUT!\n",  __func__);
 
                /* Go back to disconnected mode, keep the socket waiting */
                self->lap = NULL;
@@ -679,8 +662,8 @@ static int irlmp_state_connect_pend(struct lsap_cb *self, IRLMP_EVENT event,
        default:
                /* LM_LAP_DISCONNECT_INDICATION : Should never happen, we
                 * are *not* yet bound to the IrLAP link. Jean II */
-               IRDA_DEBUG(0, "%s(), Unknown event %s on LSAP %#02x\n",
-                          __func__, irlmp_event[event], self->slsap_sel);
+               pr_debug("%s(), Unknown event %s on LSAP %#02x\n",
+                        __func__, irlmp_event[event], self->slsap_sel);
                break;
        }
        return ret;
@@ -698,8 +681,6 @@ static int irlmp_state_dtr(struct lsap_cb *self, IRLMP_EVENT event,
        LM_REASON reason;
        int ret = 0;
 
-       IRDA_DEBUG(4, "%s()\n", __func__);
-
        IRDA_ASSERT(self != NULL, return -1;);
        IRDA_ASSERT(self->magic == LMP_LSAP_MAGIC, return -1;);
        IRDA_ASSERT(self->lap != NULL, return -1;);
@@ -721,13 +702,13 @@ static int irlmp_state_dtr(struct lsap_cb *self, IRLMP_EVENT event,
                irlmp_udata_indication(self, skb);
                break;
        case LM_CONNECT_REQUEST:
-               IRDA_DEBUG(0, "%s(), LM_CONNECT_REQUEST, "
-                          "error, LSAP already connected\n", __func__);
+               pr_debug("%s(), LM_CONNECT_REQUEST, error, LSAP already connected\n",
+                        __func__);
                /* Keep state */
                break;
        case LM_CONNECT_RESPONSE:
-               IRDA_DEBUG(0, "%s(), LM_CONNECT_RESPONSE, "
-                          "error, LSAP already connected\n", __func__);
+               pr_debug("%s(), LM_CONNECT_RESPONSE, error, LSAP already connected\n",
+                        __func__);
                /* Keep state */
                break;
        case LM_DISCONNECT_REQUEST:
@@ -739,8 +720,8 @@ static int irlmp_state_dtr(struct lsap_cb *self, IRLMP_EVENT event,
 
                /* Try to close the LAP connection if its still there */
                if (self->lap) {
-                       IRDA_DEBUG(4, "%s(), trying to close IrLAP\n",
-                                  __func__);
+                       pr_debug("%s(), trying to close IrLAP\n",
+                                __func__);
                        irlmp_do_lap_event(self->lap,
                                           LM_LAP_DISCONNECT_REQUEST,
                                           NULL);
@@ -764,14 +745,14 @@ static int irlmp_state_dtr(struct lsap_cb *self, IRLMP_EVENT event,
                reason = skb->data[3];
 
                 /* Try to close the LAP connection */
-               IRDA_DEBUG(4, "%s(), trying to close IrLAP\n", __func__);
+               pr_debug("%s(), trying to close IrLAP\n", __func__);
                irlmp_do_lap_event(self->lap, LM_LAP_DISCONNECT_REQUEST, NULL);
 
                irlmp_disconnect_indication(self, reason, skb);
                break;
        default:
-               IRDA_DEBUG(0, "%s(), Unknown event %s on LSAP %#02x\n",
-                          __func__, irlmp_event[event], self->slsap_sel);
+               pr_debug("%s(), Unknown event %s on LSAP %#02x\n",
+                        __func__, irlmp_event[event], self->slsap_sel);
                break;
        }
        return ret;
@@ -793,8 +774,6 @@ static int irlmp_state_setup(struct lsap_cb *self, IRLMP_EVENT event,
        IRDA_ASSERT(self != NULL, return -1;);
        IRDA_ASSERT(self->magic == LMP_LSAP_MAGIC, return -1;);
 
-       IRDA_DEBUG(4, "%s()\n", __func__);
-
        switch (event) {
        case LM_CONNECT_CONFIRM:
                irlmp_next_lsap_state(self, LSAP_DATA_TRANSFER_READY);
@@ -814,7 +793,7 @@ static int irlmp_state_setup(struct lsap_cb *self, IRLMP_EVENT event,
                reason = skb->data[3];
 
                 /* Try to close the LAP connection */
-               IRDA_DEBUG(4, "%s(), trying to close IrLAP\n",  __func__);
+               pr_debug("%s(), trying to close IrLAP\n",  __func__);
                irlmp_do_lap_event(self->lap, LM_LAP_DISCONNECT_REQUEST, NULL);
 
                irlmp_disconnect_indication(self, reason, skb);
@@ -832,7 +811,7 @@ static int irlmp_state_setup(struct lsap_cb *self, IRLMP_EVENT event,
                irlmp_disconnect_indication(self, reason, skb);
                break;
        case LM_WATCHDOG_TIMEOUT:
-               IRDA_DEBUG(0, "%s() WATCHDOG_TIMEOUT!\n", __func__);
+               pr_debug("%s() WATCHDOG_TIMEOUT!\n", __func__);
 
                IRDA_ASSERT(self->lap != NULL, return -1;);
                irlmp_do_lap_event(self->lap, LM_LAP_DISCONNECT_REQUEST, NULL);
@@ -841,8 +820,8 @@ static int irlmp_state_setup(struct lsap_cb *self, IRLMP_EVENT event,
                irlmp_disconnect_indication(self, LM_CONNECT_FAILURE, NULL);
                break;
        default:
-               IRDA_DEBUG(0, "%s(), Unknown event %s on LSAP %#02x\n",
-                          __func__, irlmp_event[event], self->slsap_sel);
+               pr_debug("%s(), Unknown event %s on LSAP %#02x\n",
+                        __func__, irlmp_event[event], self->slsap_sel);
                break;
        }
        return ret;
@@ -863,8 +842,6 @@ static int irlmp_state_setup_pend(struct lsap_cb *self, IRLMP_EVENT event,
        LM_REASON reason;
        int ret = 0;
 
-       IRDA_DEBUG(4, "%s()\n", __func__);
-
        IRDA_ASSERT(self != NULL, return -1;);
        IRDA_ASSERT(irlmp != NULL, return -1;);
 
@@ -883,7 +860,7 @@ static int irlmp_state_setup_pend(struct lsap_cb *self, IRLMP_EVENT event,
                irlmp_next_lsap_state(self, LSAP_SETUP);
                break;
        case LM_WATCHDOG_TIMEOUT:
-               IRDA_DEBUG(0, "%s() : WATCHDOG_TIMEOUT !\n",  __func__);
+               pr_debug("%s() : WATCHDOG_TIMEOUT !\n",  __func__);
 
                IRDA_ASSERT(self->lap != NULL, return -1;);
                irlmp_do_lap_event(self->lap, LM_LAP_DISCONNECT_REQUEST, NULL);
@@ -901,8 +878,8 @@ static int irlmp_state_setup_pend(struct lsap_cb *self, IRLMP_EVENT event,
                irlmp_disconnect_indication(self, reason, NULL);
                break;
        default:
-               IRDA_DEBUG(0, "%s(), Unknown event %s on LSAP %#02x\n",
-                          __func__, irlmp_event[event], self->slsap_sel);
+               pr_debug("%s(), Unknown event %s on LSAP %#02x\n",
+                        __func__, irlmp_event[event], self->slsap_sel);
                break;
        }
        return ret;