irda: Convert IRDA_DEBUG to pr_debug

Use the normal kernel debugging mechanism which also
enables dynamic_debug at the same time.

Other miscellanea:

o Remove sysctl for irda_debug
o Remove function tracing like uses (use ftrace instead)
o Coalesce formats
o Realign arguments
o Remove unnecessary OOM messages

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

8 files changed, 106 insertions, 206 deletions

diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index f8eea02843f5..c5837a40c78e 100644
--- a/net/irda/irlan/irlan_client.c
+++ b/net/irda/irlan/irlan_client.c
@@ -72,8 +72,6 @@ static void irlan_client_kick_timer_expired(void *data)
 {
         struct irlan_cb *self = (struct irlan_cb *) data;
 
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
@@ -91,8 +89,6 @@ static void irlan_client_kick_timer_expired(void *data)
 
 static void irlan_client_start_kick_timer(struct irlan_cb *self, int timeout)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         irda_start_timer(&self->client.kick_timer, timeout, (void *) self,
                          irlan_client_kick_timer_expired);
 }
@@ -105,8 +101,6 @@ static void irlan_client_start_kick_timer(struct irlan_cb *self, int timeout)
  */
 void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr)
 {
-        IRDA_DEBUG(1, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
@@ -117,7 +111,7 @@ void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr)
         if ((self->client.state != IRLAN_IDLE) ||
             (self->provider.access_type == ACCESS_DIRECT))
         {
-                        IRDA_DEBUG(0, "%s(), already awake!\n", __func__ );
+                pr_debug("%s(), already awake!\n", __func__);
                         return;
         }
 
@@ -126,7 +120,7 @@ void irlan_client_wakeup(struct irlan_cb *self, __u32 saddr, __u32 daddr)
         self->daddr = daddr;
 
         if (self->disconnect_reason == LM_USER_REQUEST) {
-                        IRDA_DEBUG(0, "%s(), still stopped by user\n", __func__ );
+                pr_debug("%s(), still stopped by user\n", __func__);
                         return;
         }
 
@@ -153,8 +147,6 @@ void irlan_client_discovery_indication(discinfo_t *discovery,
         struct irlan_cb *self;
         __u32 saddr, daddr;
 
-        IRDA_DEBUG(1, "%s()\n", __func__ );
-
         IRDA_ASSERT(discovery != NULL, return;);
 
         /*
@@ -175,8 +167,8 @@ void irlan_client_discovery_indication(discinfo_t *discovery,
         if (self) {
                 IRDA_ASSERT(self->magic == IRLAN_MAGIC, goto out;);
 
-                IRDA_DEBUG(1, "%s(), Found instance (%08x)!\n", __func__ ,
-                      daddr);
+                pr_debug("%s(), Found instance (%08x)!\n", __func__ ,
+                         daddr);
 
                 irlan_client_wakeup(self, saddr, daddr);
         }
@@ -195,8 +187,6 @@ static int irlan_client_ctrl_data_indication(void *instance, void *sap,
 {
         struct irlan_cb *self;
 
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
         self = instance;
 
         IRDA_ASSERT(self != NULL, return -1;);
@@ -206,7 +196,7 @@ static int irlan_client_ctrl_data_indication(void *instance, void *sap,
         irlan_do_client_event(self, IRLAN_DATA_INDICATION, skb);
 
         /* Ready for a new command */
-        IRDA_DEBUG(2, "%s(), clearing tx_busy\n", __func__ );
+        pr_debug("%s(), clearing tx_busy\n", __func__);
         self->client.tx_busy = FALSE;
 
         /* Check if we have some queued commands waiting to be sent */
@@ -223,7 +213,7 @@ static void irlan_client_ctrl_disconnect_indication(void *instance, void *sap,
         struct tsap_cb *tsap;
         struct sk_buff *skb;
 
-        IRDA_DEBUG(4, "%s(), reason=%d\n", __func__ , reason);
+        pr_debug("%s(), reason=%d\n", __func__ , reason);
 
         self = instance;
         tsap = sap;
@@ -255,8 +245,6 @@ static void irlan_client_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;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
@@ -275,7 +263,7 @@ static void irlan_client_open_ctrl_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->client.tsap_ctrl = tsap;
@@ -295,8 +283,6 @@ static void irlan_client_ctrl_connect_confirm(void *instance, void *sap,
 {
         struct irlan_cb *self;
 
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         self = instance;
 
         IRDA_ASSERT(self != NULL, return;);
@@ -374,7 +360,7 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb)
 
         IRDA_ASSERT(skb != NULL, return;);
 
-        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;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -405,7 +391,7 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb)
         /* How many parameters? */
         count = frame[1];
 
-        IRDA_DEBUG(4, "%s(), got %d parameters\n", __func__ , count);
+        pr_debug("%s(), got %d parameters\n", __func__ , count);
 
         ptr = frame+2;
 
@@ -413,7 +399,7 @@ void irlan_client_parse_response(struct irlan_cb *self, struct sk_buff *skb)
         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;
@@ -437,7 +423,7 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
         __u8 *bytes;
         int i;
 
-        IRDA_DEBUG(4, "%s(), parm=%s\n", __func__ , param);
+        pr_debug("%s(), parm=%s\n", __func__ , param);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -475,13 +461,13 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
                 else if (strcmp(value, "HOSTED") == 0)
                         self->client.access_type = ACCESS_HOSTED;
                 else {
-                        IRDA_DEBUG(2, "%s(), unknown access type!\n", __func__ );
+                        pr_debug("%s(), unknown access type!\n", __func__);
                 }
         }
         /* IRLAN version */
         if (strcmp(param, "IRLAN_VER") == 0) {
-                IRDA_DEBUG(4, "IrLAN version %d.%d\n", (__u8) value[0],
-                      (__u8) value[1]);
+                pr_debug("IrLAN version %d.%d\n", (__u8)value[0],
+                         (__u8)value[1]);
 
                 self->version[0] = value[0];
                 self->version[1] = value[1];
@@ -490,37 +476,37 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
         /* Which remote TSAP to use for data channel */
         if (strcmp(param, "DATA_CHAN") == 0) {
                 self->dtsap_sel_data = value[0];
-                IRDA_DEBUG(4, "Data TSAP = %02x\n", self->dtsap_sel_data);
+                pr_debug("Data TSAP = %02x\n", self->dtsap_sel_data);
                 return;
         }
         if (strcmp(param, "CON_ARB") == 0) {
                 memcpy(&tmp_cpu, value, 2); /* Align value */
                 le16_to_cpus(&tmp_cpu);     /* Convert to host order */
                 self->client.recv_arb_val = tmp_cpu;
-                IRDA_DEBUG(2, "%s(), receive arb val=%d\n", __func__ ,
-                           self->client.recv_arb_val);
+                pr_debug("%s(), receive arb val=%d\n", __func__ ,
+                         self->client.recv_arb_val);
         }
         if (strcmp(param, "MAX_FRAME") == 0) {
                 memcpy(&tmp_cpu, value, 2); /* Align value */
                 le16_to_cpus(&tmp_cpu);     /* Convert to host order */
                 self->client.max_frame = tmp_cpu;
-                IRDA_DEBUG(4, "%s(), max frame=%d\n", __func__ ,
-                           self->client.max_frame);
+                pr_debug("%s(), max frame=%d\n", __func__ ,
+                         self->client.max_frame);
         }
 
         /* RECONNECT_KEY, in case the link goes down! */
         if (strcmp(param, "RECONNECT_KEY") == 0) {
-                IRDA_DEBUG(4, "Got reconnect key: ");
+                pr_debug("Got reconnect key: ");
                 /* for (i = 0; i < val_len; i++) */
 /*                      printk("%02x", value[i]); */
                 memcpy(self->client.reconnect_key, value, val_len);
                 self->client.key_len = val_len;
-                IRDA_DEBUG(4, "\n");
+                pr_debug("\n");
         }
         /* FILTER_ENTRY, have we got an ethernet address? */
         if (strcmp(param, "FILTER_ENTRY") == 0) {
                 bytes = value;
-                IRDA_DEBUG(4, "Ethernet address = %pM\n", bytes);
+                pr_debug("Ethernet address = %pM\n", bytes);
                 for (i = 0; i < 6; i++)
                         self->dev->dev_addr[i] = bytes[i];
         }
@@ -537,8 +523,6 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
 {
         struct irlan_cb *self;
 
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(priv != NULL, return;);
 
         self = priv;
@@ -550,7 +534,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
 
         /* Check if request succeeded */
         if (result != IAS_SUCCESS) {
-                IRDA_DEBUG(2, "%s(), got NULL value!\n", __func__ );
+                pr_debug("%s(), got NULL value!\n", __func__);
                 irlan_do_client_event(self, IRLAN_IAS_PROVIDER_NOT_AVAIL,
                                       NULL);
                 return;
@@ -568,7 +552,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
                 irias_delete_value(value);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), unknown type!\n", __func__ );
+                pr_debug("%s(), unknown type!\n", __func__);
                 break;
         }
         irlan_do_client_event(self, IRLAN_IAS_PROVIDER_NOT_AVAIL, NULL);
diff --git a/net/irda/irlan/irlan_client_event.c b/net/irda/irlan/irlan_client_event.c
index f9d11bf38157..cc93fabbbb19 100644
--- a/net/irda/irlan/irlan_client_event.c
+++ b/net/irda/irlan/irlan_client_event.c
@@ -92,8 +92,6 @@ void irlan_do_client_event(struct irlan_cb *self, IRLAN_EVENT event,
 static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
                                    struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
 
@@ -114,10 +112,10 @@ static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
                                               "IrLAN", "IrDA:TinyTP:LsapSel");
                 break;
         case IRLAN_WATCHDOG_TIMEOUT:
-                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
+                pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
                 break;
         default:
-                IRDA_DEBUG(4, "%s(), Unknown event %d\n", __func__ , event);
+                pr_debug("%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -136,8 +134,6 @@ static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
 static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
                                     struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
 
@@ -154,7 +150,7 @@ static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
                 irlan_next_client_state(self, IRLAN_CONN);
                 break;
         case IRLAN_IAS_PROVIDER_NOT_AVAIL:
-                IRDA_DEBUG(2, "%s(), IAS_PROVIDER_NOT_AVAIL\n", __func__ );
+                pr_debug("%s(), IAS_PROVIDER_NOT_AVAIL\n", __func__);
                 irlan_next_client_state(self, IRLAN_IDLE);
 
                 /* Give the client a kick! */
@@ -167,10 +163,10 @@ static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
                 irlan_next_client_state(self, IRLAN_IDLE);
                 break;
         case IRLAN_WATCHDOG_TIMEOUT:
-                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
+                pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
+                pr_debug("%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -189,8 +185,6 @@ static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
 static int irlan_client_state_conn(struct irlan_cb *self, IRLAN_EVENT event,
                                    struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
 
         switch (event) {
@@ -204,10 +198,10 @@ static int irlan_client_state_conn(struct irlan_cb *self, IRLAN_EVENT event,
                 irlan_next_client_state(self, IRLAN_IDLE);
                 break;
         case IRLAN_WATCHDOG_TIMEOUT:
-                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
+                pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
+                pr_debug("%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -224,8 +218,6 @@ static int irlan_client_state_conn(struct irlan_cb *self, IRLAN_EVENT event,
 static int irlan_client_state_info(struct irlan_cb *self, IRLAN_EVENT event,
                                    struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
 
         switch (event) {
@@ -244,10 +236,10 @@ static int irlan_client_state_info(struct irlan_cb *self, IRLAN_EVENT event,
                 irlan_next_client_state(self, IRLAN_IDLE);
                 break;
         case IRLAN_WATCHDOG_TIMEOUT:
-                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
+                pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
+                pr_debug("%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -266,8 +258,6 @@ static int irlan_client_state_info(struct irlan_cb *self, IRLAN_EVENT event,
 static int irlan_client_state_media(struct irlan_cb *self, IRLAN_EVENT event,
                                     struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
 
         switch(event) {
@@ -281,10 +271,10 @@ static int irlan_client_state_media(struct irlan_cb *self, IRLAN_EVENT event,
                 irlan_next_client_state(self, IRLAN_IDLE);
                 break;
         case IRLAN_WATCHDOG_TIMEOUT:
-                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
+                pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
+                pr_debug("%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -305,8 +295,6 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event,
 {
         struct qos_info qos;
 
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
 
         switch(event) {
@@ -344,7 +332,7 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event,
                         irlan_next_client_state(self, IRLAN_DATA);
                         break;
                 default:
-                        IRDA_DEBUG(2, "%s(), unknown access type!\n", __func__ );
+                        pr_debug("%s(), unknown access type!\n", __func__);
                         break;
                 }
                 break;
@@ -353,10 +341,10 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event,
                 irlan_next_client_state(self, IRLAN_IDLE);
                 break;
         case IRLAN_WATCHDOG_TIMEOUT:
-                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
+                pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
+                pr_debug("%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
 
@@ -376,8 +364,6 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event,
 static int irlan_client_state_wait(struct irlan_cb *self, IRLAN_EVENT event,
                                    struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
 
         switch(event) {
@@ -390,10 +376,10 @@ static int irlan_client_state_wait(struct irlan_cb *self, IRLAN_EVENT event,
                 irlan_next_client_state(self, IRLAN_IDLE);
                 break;
         case IRLAN_WATCHDOG_TIMEOUT:
-                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
+                pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
+                pr_debug("%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -407,8 +393,6 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event,
 {
         struct qos_info qos;
 
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
 
         switch(event) {
@@ -429,7 +413,7 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event,
                 } else if (self->client.recv_arb_val >
                            self->provider.send_arb_val)
                 {
-                        IRDA_DEBUG(2, "%s(), lost the battle :-(\n", __func__ );
+                        pr_debug("%s(), lost the battle :-(\n", __func__);
                 }
                 break;
         case IRLAN_DATA_CONNECT_INDICATION:
@@ -440,10 +424,10 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event,
                 irlan_next_client_state(self, IRLAN_IDLE);
                 break;
         case IRLAN_WATCHDOG_TIMEOUT:
-                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
+                pr_debug("%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
+                pr_debug("%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -462,8 +446,6 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event,
 static int irlan_client_state_data(struct irlan_cb *self, IRLAN_EVENT event,
                                    struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
 
@@ -476,7 +458,7 @@ static int irlan_client_state_data(struct irlan_cb *self, IRLAN_EVENT event,
                 irlan_next_client_state(self, IRLAN_IDLE);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
+                pr_debug("%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -494,8 +476,6 @@ static int irlan_client_state_data(struct irlan_cb *self, IRLAN_EVENT event,
 static int irlan_client_state_close(struct irlan_cb *self, IRLAN_EVENT event,
                                     struct sk_buff *skb)
 {
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
         if (skb)
                 dev_kfree_skb(skb);
 
@@ -511,8 +491,6 @@ static int irlan_client_state_close(struct irlan_cb *self, IRLAN_EVENT event,
 static int irlan_client_state_sync(struct irlan_cb *self, IRLAN_EVENT event,
                                    struct sk_buff *skb)
 {
-        IRDA_DEBUG(2, "%s()\n", __func__ );
-
         if (skb)
                 dev_kfree_skb(skb);
 
diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index cc60b4a282ae..481bbc2a4349 100644
--- 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;
 }
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c
index 94b948ef36f9..fcfbe579434a 100644
--- a/net/irda/irlan/irlan_eth.c
+++ b/net/irda/irlan/irlan_eth.c
@@ -110,8 +110,6 @@ static int irlan_eth_open(struct net_device *dev)
 {
         struct irlan_cb *self = netdev_priv(dev);
 
-        IRDA_DEBUG(2, "%s()\n", __func__);
-
         /* Ready to play! */
         netif_stop_queue(dev); /* Wait until data link is ready */
 
@@ -137,8 +135,6 @@ static int irlan_eth_close(struct net_device *dev)
 {
         struct irlan_cb *self = netdev_priv(dev);
 
-        IRDA_DEBUG(2, "%s()\n", __func__);
-
         /* Stop device */
         netif_stop_queue(dev);
 
@@ -231,8 +227,8 @@ int irlan_eth_receive(void *instance, void *sap, struct sk_buff *skb)
                 return 0;
         }
         if (skb->len < ETH_HLEN) {
-                IRDA_DEBUG(0, "%s() : IrLAN frame too short (%d)\n",
-                           __func__, skb->len);
+                pr_debug("%s() : IrLAN frame too short (%d)\n",
+                         __func__, skb->len);
                 dev->stats.rx_dropped++;
                 dev_kfree_skb(skb);
                 return 0;
@@ -281,9 +277,9 @@ void irlan_eth_flow_indication(void *instance, void *sap, LOCAL_FLOW flow)
 
         IRDA_ASSERT(dev != NULL, return;);
 
-        IRDA_DEBUG(0, "%s() : flow %s ; running %d\n", __func__,
-                   flow == FLOW_STOP ? "FLOW_STOP" : "FLOW_START",
-                   netif_running(dev));
+        pr_debug("%s() : flow %s ; running %d\n", __func__,
+                 flow == FLOW_STOP ? "FLOW_STOP" : "FLOW_START",
+                 netif_running(dev));
 
         switch (flow) {
         case FLOW_STOP:
@@ -310,11 +306,9 @@ static void irlan_eth_set_multicast_list(struct net_device *dev)
 {
         struct irlan_cb *self = netdev_priv(dev);
 
-        IRDA_DEBUG(2, "%s()\n", __func__);
-
         /* Check if data channel has been connected yet */
         if (self->client.state != IRLAN_DATA) {
-                IRDA_DEBUG(1, "%s(), delaying!\n", __func__);
+                pr_debug("%s(), delaying!\n", __func__);
                 return;
         }
 
@@ -324,18 +318,18 @@ static void irlan_eth_set_multicast_list(struct net_device *dev)
         } else if ((dev->flags & IFF_ALLMULTI) ||
                  netdev_mc_count(dev) > HW_MAX_ADDRS) {
                 /* Disable promiscuous mode, use normal mode. */
-                IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __func__);
+                pr_debug("%s(), Setting multicast filter\n", __func__);
                 /* hardware_set_filter(NULL); */
 
                 irlan_set_multicast_filter(self, TRUE);
         } else if (!netdev_mc_empty(dev)) {
-                IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __func__);
+                pr_debug("%s(), Setting multicast filter\n", __func__);
                 /* Walk the address list, and load the filter */
                 /* hardware_set_filter(dev->mc_list); */
 
                 irlan_set_multicast_filter(self, TRUE);
         } else {
-                IRDA_DEBUG(4, "%s(), Clearing multicast filter\n", __func__);
+                pr_debug("%s(), Clearing multicast filter\n", __func__);
                 irlan_set_multicast_filter(self, FALSE);
         }
 
diff --git a/net/irda/irlan/irlan_event.c b/net/irda/irlan/irlan_event.c
index 43f16040a6fe..9a1cc11c16f6 100644
--- a/net/irda/irlan/irlan_event.c
+++ b/net/irda/irlan/irlan_event.c
@@ -40,7 +40,7 @@ const char * const irlan_state[] = {
 
 void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state)
 {
-        IRDA_DEBUG(2, "%s(), %s\n", __func__ , irlan_state[state]);
+        pr_debug("%s(), %s\n", __func__ , irlan_state[state]);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -50,7 +50,7 @@ void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state)
 
 void irlan_next_provider_state(struct irlan_cb *self, IRLAN_STATE state)
 {
-        IRDA_DEBUG(2, "%s(), %s\n", __func__ , irlan_state[state]);
+        pr_debug("%s(), %s\n", __func__ , irlan_state[state]);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
diff --git a/net/irda/irlan/irlan_filter.c b/net/irda/irlan/irlan_filter.c
index 7977be7caf0f..e755e90b2f26 100644
--- a/net/irda/irlan/irlan_filter.c
+++ b/net/irda/irlan/irlan_filter.c
@@ -43,7 +43,7 @@ void irlan_filter_request(struct irlan_cb *self, struct sk_buff *skb)
         if ((self->provider.filter_type == IRLAN_DIRECTED) &&
             (self->provider.filter_operation == DYNAMIC))
         {
-                IRDA_DEBUG(0, "Giving peer a dynamic Ethernet address\n");
+                pr_debug("Giving peer a dynamic Ethernet address\n");
                 self->provider.mac_address[0] = 0x40;
                 self->provider.mac_address[1] = 0x00;
                 self->provider.mac_address[2] = 0x00;
@@ -73,7 +73,7 @@ void irlan_filter_request(struct irlan_cb *self, struct sk_buff *skb)
         if ((self->provider.filter_type == IRLAN_DIRECTED) &&
             (self->provider.filter_mode == FILTER))
         {
-                IRDA_DEBUG(0, "Directed filter on\n");
+                pr_debug("Directed filter on\n");
                 skb->data[0] = 0x00; /* Success */
                 skb->data[1] = 0x00;
                 return;
@@ -81,7 +81,7 @@ void irlan_filter_request(struct irlan_cb *self, struct sk_buff *skb)
         if ((self->provider.filter_type == IRLAN_DIRECTED) &&
             (self->provider.filter_mode == NONE))
         {
-                IRDA_DEBUG(0, "Directed filter off\n");
+                pr_debug("Directed filter off\n");
                 skb->data[0] = 0x00; /* Success */
                 skb->data[1] = 0x00;
                 return;
@@ -90,7 +90,7 @@ void irlan_filter_request(struct irlan_cb *self, struct sk_buff *skb)
         if ((self->provider.filter_type == IRLAN_BROADCAST) &&
             (self->provider.filter_mode == FILTER))
         {
-                IRDA_DEBUG(0, "Broadcast filter on\n");
+                pr_debug("Broadcast filter on\n");
                 skb->data[0] = 0x00; /* Success */
                 skb->data[1] = 0x00;
                 return;
@@ -98,7 +98,7 @@ void irlan_filter_request(struct irlan_cb *self, struct sk_buff *skb)
         if ((self->provider.filter_type == IRLAN_BROADCAST) &&
             (self->provider.filter_mode == NONE))
         {
-                IRDA_DEBUG(0, "Broadcast filter off\n");
+                pr_debug("Broadcast filter off\n");
                 skb->data[0] = 0x00; /* Success */
                 skb->data[1] = 0x00;
                 return;
@@ -106,7 +106,7 @@ void irlan_filter_request(struct irlan_cb *self, struct sk_buff *skb)
         if ((self->provider.filter_type == IRLAN_MULTICAST) &&
             (self->provider.filter_mode == FILTER))
         {
-                IRDA_DEBUG(0, "Multicast filter on\n");
+                pr_debug("Multicast filter on\n");
                 skb->data[0] = 0x00; /* Success */
                 skb->data[1] = 0x00;
                 return;
@@ -114,7 +114,7 @@ void irlan_filter_request(struct irlan_cb *self, struct sk_buff *skb)
         if ((self->provider.filter_type == IRLAN_MULTICAST) &&
             (self->provider.filter_mode == NONE))
         {
-                IRDA_DEBUG(0, "Multicast filter off\n");
+                pr_debug("Multicast filter off\n");
                 skb->data[0] = 0x00; /* Success */
                 skb->data[1] = 0x00;
                 return;
@@ -122,7 +122,7 @@ void irlan_filter_request(struct irlan_cb *self, struct sk_buff *skb)
         if ((self->provider.filter_type == IRLAN_MULTICAST) &&
             (self->provider.filter_operation == GET))
         {
-                IRDA_DEBUG(0, "Multicast filter get\n");
+                pr_debug("Multicast filter get\n");
                 skb->data[0] = 0x00; /* Success? */
                 skb->data[1] = 0x02;
                 irlan_insert_string_param(skb, "FILTER_MODE", "NONE");
@@ -132,7 +132,7 @@ void irlan_filter_request(struct irlan_cb *self, struct sk_buff *skb)
         skb->data[0] = 0x00; /* Command not supported */
         skb->data[1] = 0x00;
 
-        IRDA_DEBUG(0, "Not implemented!\n");
+        pr_debug("Not implemented!\n");
 }
 
 /*
@@ -143,18 +143,15 @@ void irlan_filter_request(struct irlan_cb *self, struct sk_buff *skb)
  */
 void irlan_check_command_param(struct irlan_cb *self, char *param, char *value)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
-        IRDA_DEBUG(4, "%s, %s\n", param, value);
+        pr_debug("%s, %s\n", param, value);
 
         /*
          *  This is experimental!! DB.
          */
          if (strcmp(param, "MODE") == 0) {
-                IRDA_DEBUG(0, "%s()\n", __func__ );
                 self->use_udata = TRUE;
                 return;
         }
diff --git a/net/irda/irlan/irlan_provider.c b/net/irda/irlan/irlan_provider.c
index 4664855222f4..15c292cf2644 100644
--- 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;
diff --git a/net/irda/irlan/irlan_provider_event.c b/net/irda/irlan/irlan_provider_event.c
index 01a9d7c993ee..9c4f7f51d6b5 100644
--- a/net/irda/irlan/irlan_provider_event.c
+++ b/net/irda/irlan/irlan_provider_event.c
@@ -72,8 +72,6 @@ void irlan_do_provider_event(struct irlan_cb *self, IRLAN_EVENT event,
 static int irlan_provider_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
                                      struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
 
         switch(event) {
@@ -82,7 +80,7 @@ static int irlan_provider_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
              irlan_next_provider_state( self, IRLAN_INFO);
              break;
         default:
-                IRDA_DEBUG(4, "%s(), Unknown event %d\n", __func__ , event);
+                pr_debug("%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -101,8 +99,6 @@ static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
 {
         int ret;
 
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
 
         switch(event) {
@@ -147,7 +143,7 @@ static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
                 irlan_next_provider_state(self, IRLAN_IDLE);
                 break;
         default:
-                IRDA_DEBUG( 0, "%s(), Unknown event %d\n", __func__ , event);
+                pr_debug("%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -166,8 +162,6 @@ static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
 static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event,
                                      struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
 
         switch(event) {
@@ -186,7 +180,7 @@ static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event,
                 irlan_next_provider_state(self, IRLAN_IDLE);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
+                pr_debug("%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -205,8 +199,6 @@ static int irlan_provider_state_open(struct irlan_cb *self, IRLAN_EVENT event,
 static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event,
                                      struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __func__ );
-
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
 
@@ -221,7 +213,7 @@ static int irlan_provider_state_data(struct irlan_cb *self, IRLAN_EVENT event,
                 irlan_next_provider_state(self, IRLAN_IDLE);
                 break;
         default:
-                IRDA_DEBUG( 0, "%s(), Unknown event %d\n", __func__ , event);
+                pr_debug("%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)