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

[cascardo/linux.git] / net / irda / irlan / irlan_provider.c

diff --git a/net/irda/irlan/irlan_provider.c b/net/irda/irlan/irlan_provider.c
index 4664855..15c292c 100644 (file)
--- a/net/irda/irlan/irlan_provider.c
+++ b/net/irda/irlan/irlan_provider.c
@@ -70,8 +70,6 @@ static int irlan_provider_data_indication(void *instance, void *sap,
        struct irlan_cb *self;
        __u8 code;
 
-       IRDA_DEBUG(4, "%s()\n", __func__ );
-
        self = instance;
 
        IRDA_ASSERT(self != NULL, return -1;);
@@ -82,32 +80,32 @@ static int irlan_provider_data_indication(void *instance, void *sap,
        code = skb->data[0];
        switch(code) {
        case CMD_GET_PROVIDER_INFO:
-               IRDA_DEBUG(4, "Got GET_PROVIDER_INFO command!\n");
+               pr_debug("Got GET_PROVIDER_INFO command!\n");
                irlan_do_provider_event(self, IRLAN_GET_INFO_CMD, skb);
                break;
 
        case CMD_GET_MEDIA_CHAR:
-               IRDA_DEBUG(4, "Got GET_MEDIA_CHAR command!\n");
+               pr_debug("Got GET_MEDIA_CHAR command!\n");
                irlan_do_provider_event(self, IRLAN_GET_MEDIA_CMD, skb);
                break;
        case CMD_OPEN_DATA_CHANNEL:
-               IRDA_DEBUG(4, "Got OPEN_DATA_CHANNEL command!\n");
+               pr_debug("Got OPEN_DATA_CHANNEL command!\n");
                irlan_do_provider_event(self, IRLAN_OPEN_DATA_CMD, skb);
                break;
        case CMD_FILTER_OPERATION:
-               IRDA_DEBUG(4, "Got FILTER_OPERATION command!\n");
+               pr_debug("Got FILTER_OPERATION command!\n");
                irlan_do_provider_event(self, IRLAN_FILTER_CONFIG_CMD, skb);
                break;
        case CMD_RECONNECT_DATA_CHAN:
-               IRDA_DEBUG(2, "%s(), Got RECONNECT_DATA_CHAN command\n", __func__ );
-               IRDA_DEBUG(2, "%s(), NOT IMPLEMENTED\n", __func__ );
+               pr_debug("%s(), Got RECONNECT_DATA_CHAN command\n", __func__);
+               pr_debug("%s(), NOT IMPLEMENTED\n", __func__);
                break;
        case CMD_CLOSE_DATA_CHAN:
-               IRDA_DEBUG(2, "Got CLOSE_DATA_CHAN command!\n");
-               IRDA_DEBUG(2, "%s(), NOT IMPLEMENTED\n", __func__ );
+               pr_debug("Got CLOSE_DATA_CHAN command!\n");
+               pr_debug("%s(), NOT IMPLEMENTED\n", __func__);
                break;
        default:
-               IRDA_DEBUG(2, "%s(), Unknown command!\n", __func__ );
+               pr_debug("%s(), Unknown command!\n", __func__);
                break;
        }
        return 0;
@@ -128,8 +126,6 @@ static void irlan_provider_connect_indication(void *instance, void *sap,
        struct irlan_cb *self;
        struct tsap_cb *tsap;
 
-       IRDA_DEBUG(0, "%s()\n", __func__ );
-
        self = instance;
        tsap = sap;
 
@@ -179,7 +175,7 @@ static void irlan_provider_disconnect_indication(void *instance, void *sap,
        struct irlan_cb *self;
        struct tsap_cb *tsap;
 
-       IRDA_DEBUG(4, "%s(), reason=%d\n", __func__ , reason);
+       pr_debug("%s(), reason=%d\n", __func__ , reason);
 
        self = instance;
        tsap = sap;
@@ -233,7 +229,7 @@ int irlan_provider_parse_command(struct irlan_cb *self, int cmd,
 
        IRDA_ASSERT(skb != NULL, return -RSP_PROTOCOL_ERROR;);
 
-       IRDA_DEBUG(4, "%s(), skb->len=%d\n", __func__ , (int)skb->len);
+       pr_debug("%s(), skb->len=%d\n", __func__ , (int)skb->len);
 
        IRDA_ASSERT(self != NULL, return -RSP_PROTOCOL_ERROR;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -RSP_PROTOCOL_ERROR;);
@@ -255,7 +251,7 @@ int irlan_provider_parse_command(struct irlan_cb *self, int cmd,
        /* How many parameters? */
        count = frame[1];
 
-       IRDA_DEBUG(4, "Got %d parameters\n", count);
+       pr_debug("Got %d parameters\n", count);
 
        ptr = frame+2;
 
@@ -263,7 +259,7 @@ int irlan_provider_parse_command(struct irlan_cb *self, int cmd,
        for (i=0; i<count;i++) {
                ret = irlan_extract_param(ptr, name, value, &val_len);
                if (ret < 0) {
-                       IRDA_DEBUG(2, "%s(), IrLAN, Error!\n", __func__ );
+                       pr_debug("%s(), IrLAN, Error!\n", __func__);
                        break;
                }
                ptr+=ret;
@@ -288,8 +284,6 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
 {
        struct sk_buff *skb;
 
-       IRDA_DEBUG(4, "%s()\n", __func__ );
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
@@ -320,7 +314,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
                        irlan_insert_string_param(skb, "MEDIA", "802.5");
                        break;
                default:
-                       IRDA_DEBUG(2, "%s(), unknown media type!\n", __func__ );
+                       pr_debug("%s(), unknown media type!\n", __func__);
                        break;
                }
                irlan_insert_short_param(skb, "IRLAN_VER", 0x0101);
@@ -344,7 +338,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
                        irlan_insert_string_param(skb, "ACCESS_TYPE", "HOSTED");
                        break;
                default:
-                       IRDA_DEBUG(2, "%s(), Unknown access type\n", __func__ );
+                       pr_debug("%s(), Unknown access type\n", __func__);
                        break;
                }
                irlan_insert_short_param(skb, "MAX_FRAME", 0x05ee);
@@ -364,7 +358,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
                irlan_filter_request(self, skb);
                break;
        default:
-               IRDA_DEBUG(2, "%s(), Unknown command!\n", __func__ );
+               pr_debug("%s(), Unknown command!\n", __func__);
                break;
        }
 
@@ -382,8 +376,6 @@ int irlan_provider_open_ctrl_tsap(struct irlan_cb *self)
        struct tsap_cb *tsap;
        notify_t notify;
 
-       IRDA_DEBUG(4, "%s()\n", __func__ );
-
        IRDA_ASSERT(self != NULL, return -1;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
 
@@ -403,7 +395,7 @@ int irlan_provider_open_ctrl_tsap(struct irlan_cb *self)
 
        tsap = irttp_open_tsap(LSAP_ANY, 1, &notify);
        if (!tsap) {
-               IRDA_DEBUG(2, "%s(), Got no tsap!\n", __func__ );
+               pr_debug("%s(), Got no tsap!\n", __func__);
                return -1;
        }
        self->provider.tsap_ctrl = tsap;