irda: Convert IRDA_DEBUG to pr_debug

[deliverable/linux.git] / net / irda / irlan / irlan_common.c

diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index cc60b4a282aec7fa7f9459541bd9895091ed7518..481bbc2a4349300d51c66452a5362b4e1b4b4c81 100644 (file)
--- a/net/irda/irlan/irlan_common.c
+++ b/net/irda/irlan/irlan_common.c
@@ -118,8 +118,6 @@ static int __init irlan_init(void)
        struct irlan_cb *new;
        __u16 hints;
 
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
 #ifdef CONFIG_PROC_FS
        { struct proc_dir_entry *proc;
        proc = proc_create("irlan", 0, proc_irda, &irlan_fops);
@@ -130,7 +128,6 @@ static int __init irlan_init(void)
        }
 #endif /* CONFIG_PROC_FS */
 
-       IRDA_DEBUG(4, "%s()\n", __func__ );
        hints = irlmp_service_to_hint(S_LAN);
 
        /* Register with IrLMP as a client */
@@ -173,8 +170,6 @@ static void __exit irlan_cleanup(void)
 {
        struct irlan_cb *self, *next;
 
-       IRDA_DEBUG(4, "%s()\n", __func__ );
-
        irlmp_unregister_client(ckey);
        irlmp_unregister_service(skey);
 
@@ -201,8 +196,6 @@ static struct irlan_cb __init *irlan_open(__u32 saddr, __u32 daddr)
        struct net_device *dev;
        struct irlan_cb *self;
 
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        /* Create network device with irlan */
        dev = alloc_irlandev(eth ? "eth%d" : "irlan%d");
        if (!dev)
@@ -245,8 +238,8 @@ static struct irlan_cb __init *irlan_open(__u32 saddr, __u32 daddr)
        irlan_next_provider_state(self, IRLAN_IDLE);
 
        if (register_netdev(dev)) {
-               IRDA_DEBUG(2, "%s(), register_netdev() failed!\n",
-                          __func__ );
+               pr_debug("%s(), register_netdev() failed!\n",
+                        __func__);
                self = NULL;
                free_netdev(dev);
        } else {
@@ -266,8 +259,6 @@ static struct irlan_cb __init *irlan_open(__u32 saddr, __u32 daddr)
  */
 static void __irlan_close(struct irlan_cb *self)
 {
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        ASSERT_RTNL();
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -314,8 +305,6 @@ static void irlan_connect_indication(void *instance, void *sap,
        struct irlan_cb *self;
        struct tsap_cb *tsap;
 
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        self = instance;
        tsap = sap;
 
@@ -326,7 +315,7 @@ static void irlan_connect_indication(void *instance, void *sap,
        self->max_sdu_size = max_sdu_size;
        self->max_header_size = max_header_size;
 
-       IRDA_DEBUG(0, "%s: We are now connected!\n", __func__);
+       pr_debug("%s: We are now connected!\n", __func__);
 
        del_timer(&self->watchdog_timer);
 
@@ -370,7 +359,7 @@ static void irlan_connect_confirm(void *instance, void *sap,
 
        /* TODO: we could set the MTU depending on the max_sdu_size */
 
-       IRDA_DEBUG(0, "%s: We are now connected!\n", __func__);
+       pr_debug("%s: We are now connected!\n", __func__);
        del_timer(&self->watchdog_timer);
 
        /*
@@ -403,7 +392,7 @@ static void irlan_disconnect_indication(void *instance,
        struct irlan_cb *self;
        struct tsap_cb *tsap;
 
-       IRDA_DEBUG(0, "%s(), reason=%d\n", __func__ , reason);
+       pr_debug("%s(), reason=%d\n", __func__ , reason);
 
        self = instance;
        tsap = sap;
@@ -415,26 +404,26 @@ static void irlan_disconnect_indication(void *instance,
 
        IRDA_ASSERT(tsap == self->tsap_data, return;);
 
-       IRDA_DEBUG(2, "IrLAN, data channel disconnected by peer!\n");
+       pr_debug("IrLAN, data channel disconnected by peer!\n");
 
        /* Save reason so we know if we should try to reconnect or not */
        self->disconnect_reason = reason;
 
        switch (reason) {
        case LM_USER_REQUEST: /* User request */
-               IRDA_DEBUG(2, "%s(), User requested\n", __func__ );
+               pr_debug("%s(), User requested\n", __func__);
                break;
        case LM_LAP_DISCONNECT: /* Unexpected IrLAP disconnect */
-               IRDA_DEBUG(2, "%s(), Unexpected IrLAP disconnect\n", __func__ );
+               pr_debug("%s(), Unexpected IrLAP disconnect\n", __func__);
                break;
        case LM_CONNECT_FAILURE: /* Failed to establish IrLAP connection */
-               IRDA_DEBUG(2, "%s(), IrLAP connect failed\n", __func__ );
+               pr_debug("%s(), IrLAP connect failed\n", __func__);
                break;
        case LM_LAP_RESET:  /* IrLAP reset */
-               IRDA_DEBUG(2, "%s(), IrLAP reset\n", __func__ );
+               pr_debug("%s(), IrLAP reset\n", __func__);
                break;
        case LM_INIT_DISCONNECT:
-               IRDA_DEBUG(2, "%s(), IrLMP connect failed\n", __func__ );
+               pr_debug("%s(), IrLMP connect failed\n", __func__);
                break;
        default:
                net_err_ratelimited("%s(), Unknown disconnect reason\n",
@@ -460,8 +449,6 @@ void irlan_open_data_tsap(struct irlan_cb *self)
        struct tsap_cb *tsap;
        notify_t notify;
 
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
@@ -482,7 +469,7 @@ void irlan_open_data_tsap(struct irlan_cb *self)
 
        tsap = irttp_open_tsap(LSAP_ANY, DEFAULT_INITIAL_CREDIT, &notify);
        if (!tsap) {
-               IRDA_DEBUG(2, "%s(), Got no tsap!\n", __func__ );
+               pr_debug("%s(), Got no tsap!\n", __func__);
                return;
        }
        self->tsap_data = tsap;
@@ -496,8 +483,6 @@ void irlan_open_data_tsap(struct irlan_cb *self)
 
 void irlan_close_tsaps(struct irlan_cb *self)
 {
-       IRDA_DEBUG(4, "%s()\n", __func__ );
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
@@ -586,8 +571,6 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
 {
        struct sk_buff *skb;
 
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        if (irda_lock(&self->client.tx_busy) == FALSE)
                return -EBUSY;
 
@@ -605,7 +588,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
                dev_kfree_skb(skb);
                return -1;
        }
-       IRDA_DEBUG(2, "%s(), sending ...\n", __func__ );
+       pr_debug("%s(), sending ...\n", __func__);
 
        return irttp_data_request(self->client.tsap_ctrl, skb);
 }
@@ -618,8 +601,6 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
  */
 static void irlan_ctrl_data_request(struct irlan_cb *self, struct sk_buff *skb)
 {
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        /* Queue command */
        skb_queue_tail(&self->client.txq, skb);
 
@@ -638,8 +619,6 @@ void irlan_get_provider_info(struct irlan_cb *self)
        struct sk_buff *skb;
        __u8 *frame;
 
-       IRDA_DEBUG(4, "%s()\n", __func__ );
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
@@ -671,8 +650,6 @@ void irlan_open_data_channel(struct irlan_cb *self)
        struct sk_buff *skb;
        __u8 *frame;
 
-       IRDA_DEBUG(4, "%s()\n", __func__ );
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
@@ -706,8 +683,6 @@ void irlan_close_data_channel(struct irlan_cb *self)
        struct sk_buff *skb;
        __u8 *frame;
 
-       IRDA_DEBUG(4, "%s()\n", __func__ );
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
@@ -747,8 +722,6 @@ static void irlan_open_unicast_addr(struct irlan_cb *self)
        struct sk_buff *skb;
        __u8 *frame;
 
-       IRDA_DEBUG(4, "%s()\n", __func__ );
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
@@ -789,8 +762,6 @@ void irlan_set_broadcast_filter(struct irlan_cb *self, int status)
        struct sk_buff *skb;
        __u8 *frame;
 
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
@@ -833,8 +804,6 @@ void irlan_set_multicast_filter(struct irlan_cb *self, int status)
        struct sk_buff *skb;
        __u8 *frame;
 
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
@@ -878,8 +847,6 @@ static void irlan_get_unicast_addr(struct irlan_cb *self)
        struct sk_buff *skb;
        __u8 *frame;
 
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
@@ -918,8 +885,6 @@ void irlan_get_media_char(struct irlan_cb *self)
        struct sk_buff *skb;
        __u8 *frame;
 
-       IRDA_DEBUG(4, "%s()\n", __func__ );
-
        IRDA_ASSERT(self != NULL, return;);
        IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
@@ -1006,7 +971,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
        int n=0;
 
        if (skb == NULL) {
-               IRDA_DEBUG(2, "%s(), Got NULL skb\n", __func__ );
+               pr_debug("%s(), Got NULL skb\n", __func__);
                return 0;
        }
 
@@ -1023,7 +988,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
                IRDA_ASSERT(value_len > 0, return 0;);
                break;
        default:
-               IRDA_DEBUG(2, "%s(), Unknown parameter type!\n", __func__ );
+               pr_debug("%s(), Unknown parameter type!\n", __func__);
                return 0;
        }
 
@@ -1032,7 +997,7 @@ static int __irlan_insert_param(struct sk_buff *skb, char *param, int type,
 
        /* Make space for data */
        if (skb_tailroom(skb) < (param_len+value_len+3)) {
-               IRDA_DEBUG(2, "%s(), No more space at end of skb\n", __func__ );
+               pr_debug("%s(), No more space at end of skb\n", __func__);
                return 0;
        }
        skb_put(skb, param_len+value_len+3);
@@ -1079,13 +1044,11 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len)
        __u16 val_len;
        int n=0;
 
-       IRDA_DEBUG(4, "%s()\n", __func__ );
-
        /* get length of parameter name (1 byte) */
        name_len = buf[n++];
 
        if (name_len > 254) {
-               IRDA_DEBUG(2, "%s(), name_len > 254\n", __func__ );
+               pr_debug("%s(), name_len > 254\n", __func__);
                return -RSP_INVALID_COMMAND_FORMAT;
        }
 
@@ -1102,7 +1065,7 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len)
        le16_to_cpus(&val_len); n+=2;
 
        if (val_len >= 1016) {
-               IRDA_DEBUG(2, "%s(), parameter length to long\n", __func__ );
+               pr_debug("%s(), parameter length to long\n", __func__);
                return -RSP_INVALID_COMMAND_FORMAT;
        }
        *len = val_len;
@@ -1112,8 +1075,8 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len)
        value[val_len] = '\0';
        n+=val_len;
 
-       IRDA_DEBUG(4, "Parameter: %s ", name);
-       IRDA_DEBUG(4, "Value: %s\n", value);
+       pr_debug("Parameter: %s ", name);
+       pr_debug("Value: %s\n", value);
 
        return n;
 }