8 files changed, 128 insertions, 128 deletions

diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index fff52d57a200..6be1ec26b30c 100644
--- a/net/irda/irlan/irlan_client.c
+++ b/net/irda/irlan/irlan_client.c
@@ -72,7 +72,7 @@ static void irlan_client_kick_timer_expired(void *data)
 {
         struct irlan_cb *self = (struct irlan_cb *) data;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -91,7 +91,7 @@ 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", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         irda_start_timer(&self->client.kick_timer, timeout, (void *) self,
                          irlan_client_kick_timer_expired);
@@ -105,7 +105,7 @@ 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", __FUNCTION__ );
+        IRDA_DEBUG(1, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -117,7 +117,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", __FUNCTION__ );
+                        IRDA_DEBUG(0, "%s(), already awake!\n", __func__ );
                         return;
         }
 
@@ -126,7 +126,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", __FUNCTION__ );
+                        IRDA_DEBUG(0, "%s(), still stopped by user\n", __func__ );
                         return;
         }
 
@@ -153,7 +153,7 @@ void irlan_client_discovery_indication(discinfo_t *discovery,
         struct irlan_cb *self;
         __u32 saddr, daddr;
 
-        IRDA_DEBUG(1, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(1, "%s()\n", __func__ );
 
         IRDA_ASSERT(discovery != NULL, return;);
 
@@ -175,7 +175,7 @@ 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", __FUNCTION__ ,
+                IRDA_DEBUG(1, "%s(), Found instance (%08x)!\n", __func__ ,
                       daddr);
 
                 irlan_client_wakeup(self, saddr, daddr);
@@ -195,7 +195,7 @@ static int irlan_client_ctrl_data_indication(void *instance, void *sap,
 {
         struct irlan_cb *self;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         self = (struct irlan_cb *) instance;
 
@@ -206,7 +206,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", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s(), clearing tx_busy\n", __func__ );
         self->client.tx_busy = FALSE;
 
         /* Check if we have some queued commands waiting to be sent */
@@ -223,7 +223,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", __FUNCTION__ , reason);
+        IRDA_DEBUG(4, "%s(), reason=%d\n", __func__ , reason);
 
         self = (struct irlan_cb *) instance;
         tsap = (struct tsap_cb *) sap;
@@ -255,7 +255,7 @@ static void irlan_client_open_ctrl_tsap(struct irlan_cb *self)
         struct tsap_cb *tsap;
         notify_t notify;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -275,7 +275,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), Got no tsap!\n", __func__ );
                 return;
         }
         self->client.tsap_ctrl = tsap;
@@ -295,7 +295,7 @@ static void irlan_client_ctrl_connect_confirm(void *instance, void *sap,
 {
         struct irlan_cb *self;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         self = (struct irlan_cb *) instance;
 
@@ -374,13 +374,13 @@ 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", __FUNCTION__ , (int) skb->len);
+        IRDA_DEBUG(4, "%s() skb->len=%d\n", __func__ , (int) skb->len);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
 
         if (!skb) {
-                IRDA_ERROR("%s(), Got NULL skb!\n", __FUNCTION__);
+                IRDA_ERROR("%s(), Got NULL skb!\n", __func__);
                 return;
         }
         frame = skb->data;
@@ -405,7 +405,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", __FUNCTION__ , count);
+        IRDA_DEBUG(4, "%s(), got %d parameters\n", __func__ , count);
 
         ptr = frame+2;
 
@@ -413,7 +413,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", __FUNCTION__ );
+                        IRDA_DEBUG(2, "%s(), IrLAN, Error!\n", __func__ );
                         break;
                 }
                 ptr += ret;
@@ -438,7 +438,7 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
         int i;
         DECLARE_MAC_BUF(mac);
 
-        IRDA_DEBUG(4, "%s(), parm=%s\n", __FUNCTION__ , param);
+        IRDA_DEBUG(4, "%s(), parm=%s\n", __func__ , param);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -476,7 +476,7 @@ 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", __FUNCTION__ );
+                        IRDA_DEBUG(2, "%s(), unknown access type!\n", __func__ );
                 }
         }
         /* IRLAN version */
@@ -498,14 +498,14 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
                 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", __FUNCTION__ ,
+                IRDA_DEBUG(2, "%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", __FUNCTION__ ,
+                IRDA_DEBUG(4, "%s(), max frame=%d\n", __func__ ,
                            self->client.max_frame);
         }
 
@@ -539,7 +539,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
 {
         struct irlan_cb *self;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(priv != NULL, return;);
 
@@ -552,7 +552,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), got NULL value!\n", __func__ );
                 irlan_do_client_event(self, IRLAN_IAS_PROVIDER_NOT_AVAIL,
                                       NULL);
                 return;
@@ -570,7 +570,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%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 6afcee59e906..8d5a8ebc444f 100644
--- a/net/irda/irlan/irlan_client_event.c
+++ b/net/irda/irlan/irlan_client_event.c
@@ -92,7 +92,7 @@ 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", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
@@ -101,7 +101,7 @@ static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
         case IRLAN_DISCOVERY_INDICATION:
                 if (self->client.iriap) {
                         IRDA_WARNING("%s(), busy with a previous query\n",
-                                     __FUNCTION__);
+                                     __func__);
                         return -EBUSY;
                 }
 
@@ -114,10 +114,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
                 break;
         default:
-                IRDA_DEBUG(4, "%s(), Unknown event %d\n", __FUNCTION__ , event);
+                IRDA_DEBUG(4, "%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -136,7 +136,7 @@ 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", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
@@ -154,7 +154,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), IAS_PROVIDER_NOT_AVAIL\n", __func__ );
                 irlan_next_client_state(self, IRLAN_IDLE);
 
                 /* Give the client a kick! */
@@ -167,10 +167,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
+                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -189,7 +189,7 @@ 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", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
 
@@ -204,10 +204,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
+                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -224,7 +224,7 @@ 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", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
 
@@ -244,10 +244,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
+                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -266,7 +266,7 @@ 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", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
 
@@ -281,10 +281,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
+                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -305,7 +305,7 @@ static int irlan_client_state_open(struct irlan_cb *self, IRLAN_EVENT event,
 {
         struct qos_info qos;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
 
@@ -344,7 +344,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", __FUNCTION__ );
+                        IRDA_DEBUG(2, "%s(), unknown access type!\n", __func__ );
                         break;
                 }
                 break;
@@ -353,10 +353,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
+                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
 
@@ -376,7 +376,7 @@ 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", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
 
@@ -390,10 +390,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
+                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -407,7 +407,7 @@ static int irlan_client_state_arb(struct irlan_cb *self, IRLAN_EVENT event,
 {
         struct qos_info qos;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
 
@@ -429,7 +429,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", __FUNCTION__ );
+                        IRDA_DEBUG(2, "%s(), lost the battle :-(\n", __func__ );
                 }
                 break;
         case IRLAN_DATA_CONNECT_INDICATION:
@@ -440,10 +440,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __func__ );
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__ , event);
+                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -462,7 +462,7 @@ 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", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
@@ -476,7 +476,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", __FUNCTION__ , event);
+                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -494,7 +494,7 @@ 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", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         if (skb)
                 dev_kfree_skb(skb);
@@ -511,7 +511,7 @@ 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", __FUNCTION__ );
+        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 1eb4bbcb1c9e..75bb6a9dcaaa 100644
--- a/net/irda/irlan/irlan_common.c
+++ b/net/irda/irlan/irlan_common.c
@@ -124,7 +124,7 @@ static int __init irlan_init(void)
         struct irlan_cb *new;
         __u16 hints;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
 #ifdef CONFIG_PROC_FS
         { struct proc_dir_entry *proc;
@@ -136,7 +136,7 @@ static int __init irlan_init(void)
         }
 #endif /* CONFIG_PROC_FS */
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
         hints = irlmp_service_to_hint(S_LAN);
 
         /* Register with IrLMP as a client */
@@ -179,7 +179,7 @@ static void __exit irlan_cleanup(void)
 {
         struct irlan_cb *self, *next;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         irlmp_unregister_client(ckey);
         irlmp_unregister_service(skey);
@@ -207,7 +207,7 @@ static struct irlan_cb *irlan_open(__u32 saddr, __u32 daddr)
         struct net_device *dev;
         struct irlan_cb *self;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         /* Create network device with irlan */
         dev = alloc_irlandev(eth ? "eth%d" : "irlan%d");
@@ -252,7 +252,7 @@ static struct irlan_cb *irlan_open(__u32 saddr, __u32 daddr)
 
         if (register_netdev(dev)) {
                 IRDA_DEBUG(2, "%s(), register_netdev() failed!\n",
-                           __FUNCTION__ );
+                           __func__ );
                 self = NULL;
                 free_netdev(dev);
         } else {
@@ -272,7 +272,7 @@ static struct irlan_cb *irlan_open(__u32 saddr, __u32 daddr)
  */
 static void __irlan_close(struct irlan_cb *self)
 {
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         ASSERT_RTNL();
         IRDA_ASSERT(self != NULL, return;);
@@ -320,7 +320,7 @@ static void irlan_connect_indication(void *instance, void *sap,
         struct irlan_cb *self;
         struct tsap_cb *tsap;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         self = (struct irlan_cb *) instance;
         tsap = (struct tsap_cb *) sap;
@@ -332,7 +332,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", __FUNCTION__);
+        IRDA_DEBUG(0, "%s: We are now connected!\n", __func__);
 
         del_timer(&self->watchdog_timer);
 
@@ -376,7 +376,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", __FUNCTION__);
+        IRDA_DEBUG(0, "%s: We are now connected!\n", __func__);
         del_timer(&self->watchdog_timer);
 
         /*
@@ -412,7 +412,7 @@ static void irlan_disconnect_indication(void *instance,
         struct irlan_cb *self;
         struct tsap_cb *tsap;
 
-        IRDA_DEBUG(0, "%s(), reason=%d\n", __FUNCTION__ , reason);
+        IRDA_DEBUG(0, "%s(), reason=%d\n", __func__ , reason);
 
         self = (struct irlan_cb *) instance;
         tsap = (struct tsap_cb *) sap;
@@ -431,22 +431,22 @@ static void irlan_disconnect_indication(void *instance,
 
         switch (reason) {
         case LM_USER_REQUEST: /* User request */
-                IRDA_DEBUG(2, "%s(), User requested\n", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), User requested\n", __func__ );
                 break;
         case LM_LAP_DISCONNECT: /* Unexpected IrLAP disconnect */
-                IRDA_DEBUG(2, "%s(), Unexpected IrLAP disconnect\n", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), Unexpected IrLAP disconnect\n", __func__ );
                 break;
         case LM_CONNECT_FAILURE: /* Failed to establish IrLAP connection */
-                IRDA_DEBUG(2, "%s(), IrLAP connect failed\n", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), IrLAP connect failed\n", __func__ );
                 break;
         case LM_LAP_RESET:  /* IrLAP reset */
-                IRDA_DEBUG(2, "%s(), IrLAP reset\n", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), IrLAP reset\n", __func__ );
                 break;
         case LM_INIT_DISCONNECT:
-                IRDA_DEBUG(2, "%s(), IrLMP connect failed\n", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), IrLMP connect failed\n", __func__ );
                 break;
         default:
-                IRDA_ERROR("%s(), Unknown disconnect reason\n", __FUNCTION__);
+                IRDA_ERROR("%s(), Unknown disconnect reason\n", __func__);
                 break;
         }
 
@@ -468,7 +468,7 @@ void irlan_open_data_tsap(struct irlan_cb *self)
         struct tsap_cb *tsap;
         notify_t notify;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -490,7 +490,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), Got no tsap!\n", __func__ );
                 return;
         }
         self->tsap_data = tsap;
@@ -504,7 +504,7 @@ void irlan_open_data_tsap(struct irlan_cb *self)
 
 void irlan_close_tsaps(struct irlan_cb *self)
 {
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -594,7 +594,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
 {
         struct sk_buff *skb;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         if (irda_lock(&self->client.tx_busy) == FALSE)
                 return -EBUSY;
@@ -613,7 +613,7 @@ int irlan_run_ctrl_tx_queue(struct irlan_cb *self)
                 dev_kfree_skb(skb);
                 return -1;
         }
-        IRDA_DEBUG(2, "%s(), sending ...\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s(), sending ...\n", __func__ );
 
         return irttp_data_request(self->client.tsap_ctrl, skb);
 }
@@ -626,7 +626,7 @@ 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", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         /* Queue command */
         skb_queue_tail(&self->client.txq, skb);
@@ -646,7 +646,7 @@ void irlan_get_provider_info(struct irlan_cb *self)
         struct sk_buff *skb;
         __u8 *frame;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -679,7 +679,7 @@ void irlan_open_data_channel(struct irlan_cb *self)
         struct sk_buff *skb;
         __u8 *frame;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -714,7 +714,7 @@ void irlan_close_data_channel(struct irlan_cb *self)
         struct sk_buff *skb;
         __u8 *frame;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -755,7 +755,7 @@ static void irlan_open_unicast_addr(struct irlan_cb *self)
         struct sk_buff *skb;
         __u8 *frame;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -797,7 +797,7 @@ void irlan_set_broadcast_filter(struct irlan_cb *self, int status)
         struct sk_buff *skb;
         __u8 *frame;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -841,7 +841,7 @@ void irlan_set_multicast_filter(struct irlan_cb *self, int status)
         struct sk_buff *skb;
         __u8 *frame;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -886,7 +886,7 @@ static void irlan_get_unicast_addr(struct irlan_cb *self)
         struct sk_buff *skb;
         __u8 *frame;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -926,7 +926,7 @@ void irlan_get_media_char(struct irlan_cb *self)
         struct sk_buff *skb;
         __u8 *frame;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -1014,7 +1014,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), Got NULL skb\n", __func__ );
                 return 0;
         }
 
@@ -1031,7 +1031,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), Unknown parameter type!\n", __func__ );
                 return 0;
                 break;
         }
@@ -1041,7 +1041,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), No more space at end of skb\n", __func__ );
                 return 0;
         }
         skb_put(skb, param_len+value_len+3);
@@ -1088,13 +1088,13 @@ int irlan_extract_param(__u8 *buf, char *name, char *value, __u16 *len)
         __u16 val_len;
         int n=0;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), name_len > 254\n", __func__ );
                 return -RSP_INVALID_COMMAND_FORMAT;
         }
 
@@ -1111,7 +1111,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), parameter length to long\n", __func__ );
                 return -RSP_INVALID_COMMAND_FORMAT;
         }
         *len = val_len;
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c
index 1ab91f787cc1..7a6b14ab1e7f 100644
--- a/net/irda/irlan/irlan_eth.c
+++ b/net/irda/irlan/irlan_eth.c
@@ -103,7 +103,7 @@ static int irlan_eth_open(struct net_device *dev)
 {
         struct irlan_cb *self = netdev_priv(dev);
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         /* Ready to play! */
         netif_stop_queue(dev); /* Wait until data link is ready */
@@ -130,7 +130,7 @@ static int irlan_eth_close(struct net_device *dev)
 {
         struct irlan_cb *self = netdev_priv(dev);
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         /* Stop device */
         netif_stop_queue(dev);
@@ -221,7 +221,7 @@ int irlan_eth_receive(void *instance, void *sap, struct sk_buff *skb)
         }
         if (skb->len < ETH_HLEN) {
                 IRDA_DEBUG(0, "%s() : IrLAN frame too short (%d)\n",
-                           __FUNCTION__, skb->len);
+                           __func__, skb->len);
                 ++self->stats.rx_dropped;
                 dev_kfree_skb(skb);
                 return 0;
@@ -270,7 +270,7 @@ 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", __FUNCTION__,
+        IRDA_DEBUG(0, "%s() : flow %s ; running %d\n", __func__,
                    flow == FLOW_STOP ? "FLOW_STOP" : "FLOW_START",
                    netif_running(dev));
 
@@ -332,11 +332,11 @@ static void irlan_eth_set_multicast_list(struct net_device *dev)
 {
         struct irlan_cb *self = netdev_priv(dev);
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        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", __FUNCTION__ );
+                IRDA_DEBUG(1, "%s(), delaying!\n", __func__ );
                 return;
         }
 
@@ -346,20 +346,20 @@ static void irlan_eth_set_multicast_list(struct net_device *dev)
         }
         else if ((dev->flags & IFF_ALLMULTI) || dev->mc_count > HW_MAX_ADDRS) {
                 /* Disable promiscuous mode, use normal mode. */
-                IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __FUNCTION__ );
+                IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __func__ );
                 /* hardware_set_filter(NULL); */
 
                 irlan_set_multicast_filter(self, TRUE);
         }
         else if (dev->mc_count) {
-                IRDA_DEBUG(4, "%s(), Setting multicast filter\n", __FUNCTION__ );
+                IRDA_DEBUG(4, "%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", __FUNCTION__ );
+                IRDA_DEBUG(4, "%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 a9750a801388..cbcb4eb54037 100644
--- a/net/irda/irlan/irlan_event.c
+++ b/net/irda/irlan/irlan_event.c
@@ -40,7 +40,7 @@ char *irlan_state[] = {
 
 void irlan_next_client_state(struct irlan_cb *self, IRLAN_STATE state)
 {
-        IRDA_DEBUG(2, "%s(), %s\n", __FUNCTION__ , irlan_state[state]);
+        IRDA_DEBUG(2, "%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", __FUNCTION__ , irlan_state[state]);
+        IRDA_DEBUG(2, "%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 4384be9a6888..9ff7823abec7 100644
--- a/net/irda/irlan/irlan_filter.c
+++ b/net/irda/irlan/irlan_filter.c
@@ -145,7 +145,7 @@ void irlan_check_command_param(struct irlan_cb *self, char *param, char *value)
 {
         __u8 *bytes;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         bytes = value;
 
@@ -158,7 +158,7 @@ void irlan_check_command_param(struct irlan_cb *self, char *param, char *value)
          *  This is experimental!! DB.
          */
          if (strcmp(param, "MODE") == 0) {
-                IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
+                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 13db942812e4..3f81f81b2dfa 100644
--- a/net/irda/irlan/irlan_provider.c
+++ b/net/irda/irlan/irlan_provider.c
@@ -70,7 +70,7 @@ static int irlan_provider_data_indication(void *instance, void *sap,
         struct irlan_cb *self;
         __u8 code;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         self = (struct irlan_cb *) instance;
 
@@ -99,15 +99,15 @@ static int irlan_provider_data_indication(void *instance, void *sap,
                 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", __FUNCTION__ );
-                IRDA_DEBUG(2, "%s(), NOT IMPLEMENTED\n", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), Got RECONNECT_DATA_CHAN command\n", __func__ );
+                IRDA_DEBUG(2, "%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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), NOT IMPLEMENTED\n", __func__ );
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), Unknown command!\n", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), Unknown command!\n", __func__ );
                 break;
         }
         return 0;
@@ -129,7 +129,7 @@ static void irlan_provider_connect_indication(void *instance, void *sap,
         struct tsap_cb *tsap;
         __u32 saddr, daddr;
 
-        IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(0, "%s()\n", __func__ );
 
         self = (struct irlan_cb *) instance;
         tsap = (struct tsap_cb *) sap;
@@ -182,7 +182,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", __FUNCTION__ , reason);
+        IRDA_DEBUG(4, "%s(), reason=%d\n", __func__ , reason);
 
         self = (struct irlan_cb *) instance;
         tsap = (struct tsap_cb *) sap;
@@ -236,7 +236,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", __FUNCTION__ , (int)skb->len);
+        IRDA_DEBUG(4, "%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;);
@@ -266,7 +266,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", __FUNCTION__ );
+                        IRDA_DEBUG(2, "%s(), IrLAN, Error!\n", __func__ );
                         break;
                 }
                 ptr+=ret;
@@ -291,7 +291,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command,
 {
         struct sk_buff *skb;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -323,7 +323,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", __FUNCTION__ );
+                        IRDA_DEBUG(2, "%s(), unknown media type!\n", __func__ );
                         break;
                 }
                 irlan_insert_short_param(skb, "IRLAN_VER", 0x0101);
@@ -347,7 +347,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", __FUNCTION__ );
+                        IRDA_DEBUG(2, "%s(), Unknown access type\n", __func__ );
                         break;
                 }
                 irlan_insert_short_param(skb, "MAX_FRAME", 0x05ee);
@@ -367,7 +367,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), Unknown command!\n", __func__ );
                 break;
         }
 
@@ -385,7 +385,7 @@ int irlan_provider_open_ctrl_tsap(struct irlan_cb *self)
         struct tsap_cb *tsap;
         notify_t notify;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
@@ -406,7 +406,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", __FUNCTION__ );
+                IRDA_DEBUG(2, "%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 10ece5a47522..01a9d7c993ee 100644
--- a/net/irda/irlan/irlan_provider_event.c
+++ b/net/irda/irlan/irlan_provider_event.c
@@ -72,7 +72,7 @@ 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", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
 
@@ -82,7 +82,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", __FUNCTION__ , event);
+                IRDA_DEBUG(4, "%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -101,7 +101,7 @@ static int irlan_provider_state_info(struct irlan_cb *self, IRLAN_EVENT event,
 {
         int ret;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
 
@@ -147,7 +147,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", __FUNCTION__ , event);
+                IRDA_DEBUG( 0, "%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -166,7 +166,7 @@ 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", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
 
@@ -186,7 +186,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", __FUNCTION__ , event);
+                IRDA_DEBUG(2, "%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)
@@ -205,7 +205,7 @@ 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", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
@@ -221,7 +221,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", __FUNCTION__ , event);
+                IRDA_DEBUG( 0, "%s(), Unknown event %d\n", __func__ , event);
                 break;
         }
         if (skb)