1 files changed, 19 insertions, 19 deletions

diff --git a/net/irda/iriap_event.c b/net/irda/iriap_event.c
index 8fb9d7277ca8..a301cbd93785 100644
--- a/net/irda/iriap_event.c
+++ b/net/irda/iriap_event.c
@@ -185,7 +185,7 @@ static void state_s_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
         case IAP_LM_DISCONNECT_INDICATION:
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), Unknown event %d\n", __FUNCTION__, event);
+                IRDA_DEBUG(0, "%s(), Unknown event %d\n", __func__, event);
                 break;
         }
 }
@@ -217,7 +217,7 @@ static void state_s_connecting(struct iriap_cb *self, IRIAP_EVENT event,
                 iriap_next_client_state(self, S_DISCONNECT);
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), Unknown event %d\n", __FUNCTION__, event);
+                IRDA_DEBUG(0, "%s(), Unknown event %d\n", __func__, event);
                 break;
         }
 }
@@ -269,7 +269,7 @@ static void state_s_make_call(struct iriap_cb *self, IRIAP_EVENT event,
                 iriap_next_call_state(self, S_OUTSTANDING);
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), Unknown event %d\n", __FUNCTION__, event);
+                IRDA_DEBUG(0, "%s(), Unknown event %d\n", __func__, event);
                 break;
         }
 }
@@ -283,7 +283,7 @@ static void state_s_make_call(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_s_calling(struct iriap_cb *self, IRIAP_EVENT event,
                             struct sk_buff *skb)
 {
-        IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
+        IRDA_DEBUG(0, "%s(), Not implemented\n", __func__);
 }
 
 /*
@@ -305,7 +305,7 @@ static void state_s_outstanding(struct iriap_cb *self, IRIAP_EVENT event,
                 iriap_next_call_state(self, S_WAIT_FOR_CALL);
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), Unknown event %d\n", __FUNCTION__, event);
+                IRDA_DEBUG(0, "%s(), Unknown event %d\n", __func__, event);
                 break;
         }
 }
@@ -318,7 +318,7 @@ static void state_s_outstanding(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_s_replying(struct iriap_cb *self, IRIAP_EVENT event,
                              struct sk_buff *skb)
 {
-        IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
+        IRDA_DEBUG(0, "%s(), Not implemented\n", __func__);
 }
 
 /*
@@ -330,7 +330,7 @@ static void state_s_replying(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_s_wait_for_call(struct iriap_cb *self, IRIAP_EVENT event,
                                   struct sk_buff *skb)
 {
-        IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
+        IRDA_DEBUG(0, "%s(), Not implemented\n", __func__);
 }
 
 
@@ -343,7 +343,7 @@ static void state_s_wait_for_call(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_s_wait_active(struct iriap_cb *self, IRIAP_EVENT event,
                                 struct sk_buff *skb)
 {
-        IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
+        IRDA_DEBUG(0, "%s(), Not implemented\n", __func__);
 }
 
 /**************************************************************************
@@ -367,7 +367,7 @@ static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
         case IAP_LM_CONNECT_INDICATION:
                 tx_skb = alloc_skb(LMP_MAX_HEADER, GFP_ATOMIC);
                 if (tx_skb == NULL) {
-                        IRDA_WARNING("%s: unable to malloc!\n", __FUNCTION__);
+                        IRDA_WARNING("%s: unable to malloc!\n", __func__);
                         return;
                 }
 
@@ -386,7 +386,7 @@ static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
                 iriap_next_r_connect_state(self, R_RECEIVING);
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), unknown event %d\n", __FUNCTION__, event);
+                IRDA_DEBUG(0, "%s(), unknown event %d\n", __func__, event);
                 break;
         }
 }
@@ -397,7 +397,7 @@ static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event,
                          struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(4, "%s()\n", __func__);
 
         switch (event) {
         case IAP_LM_DISCONNECT_INDICATION:
@@ -406,7 +406,7 @@ static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event,
                 iriap_next_r_connect_state(self, R_WAITING);
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), unknown event!\n", __FUNCTION__);
+                IRDA_DEBUG(0, "%s(), unknown event!\n", __func__);
                 break;
         }
 }
@@ -421,13 +421,13 @@ static void state_r_call(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_r_waiting(struct iriap_cb *self, IRIAP_EVENT event,
                             struct sk_buff *skb)
 {
-        IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
+        IRDA_DEBUG(0, "%s(), Not implemented\n", __func__);
 }
 
 static void state_r_wait_active(struct iriap_cb *self, IRIAP_EVENT event,
                                 struct sk_buff *skb)
 {
-        IRDA_DEBUG(0, "%s(), Not implemented\n", __FUNCTION__);
+        IRDA_DEBUG(0, "%s(), Not implemented\n", __func__);
 }
 
 /*
@@ -439,7 +439,7 @@ static void state_r_wait_active(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event,
                               struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(4, "%s()\n", __func__);
 
         switch (event) {
         case IAP_RECV_F_LST:
@@ -448,7 +448,7 @@ static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event,
                 iriap_call_indication(self, skb);
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), unknown event!\n", __FUNCTION__);
+                IRDA_DEBUG(0, "%s(), unknown event!\n", __func__);
                 break;
         }
 }
@@ -462,7 +462,7 @@ static void state_r_receiving(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event,
                             struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(4, "%s()\n", __func__);
 
         IRDA_ASSERT(skb != NULL, return;);
         IRDA_ASSERT(self != NULL, return;);
@@ -483,7 +483,7 @@ static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event,
                 irlmp_data_request(self->lsap, skb);
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), unknown event!\n", __FUNCTION__);
+                IRDA_DEBUG(0, "%s(), unknown event!\n", __func__);
                 break;
         }
 }
@@ -491,7 +491,7 @@ static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event,
 static void state_r_returning(struct iriap_cb *self, IRIAP_EVENT event,
                               struct sk_buff *skb)
 {
-        IRDA_DEBUG(0, "%s(), event=%d\n", __FUNCTION__, event);
+        IRDA_DEBUG(0, "%s(), event=%d\n", __func__, event);
 
         switch (event) {
         case IAP_RECV_F_LST: