1 files changed, 18 insertions, 18 deletions

diff --git a/net/irda/irlmp_frame.c b/net/irda/irlmp_frame.c
index 0a79d9aeb08c..3750884094da 100644
--- a/net/irda/irlmp_frame.c
+++ b/net/irda/irlmp_frame.c
@@ -44,7 +44,7 @@ inline void irlmp_send_data_pdu(struct lap_cb *self, __u8 dlsap, __u8 slsap,
         skb->data[1] = slsap;
 
         if (expedited) {
-                IRDA_DEBUG(4, "%s(), sending expedited data\n", __FUNCTION__);
+                IRDA_DEBUG(4, "%s(), sending expedited data\n", __func__);
                 irlap_data_request(self->irlap, skb, TRUE);
         } else
                 irlap_data_request(self->irlap, skb, FALSE);
@@ -60,7 +60,7 @@ void irlmp_send_lcf_pdu(struct lap_cb *self, __u8 dlsap, __u8 slsap,
 {
         __u8 *frame;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(2, "%s()\n", __func__);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == LMP_LAP_MAGIC, return;);
@@ -95,7 +95,7 @@ void irlmp_link_data_indication(struct lap_cb *self, struct sk_buff *skb,
         __u8   dlsap_sel;   /* Destination LSAP address */
         __u8   *fp;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(4, "%s()\n", __func__);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == LMP_LAP_MAGIC, return;);
@@ -117,7 +117,7 @@ void irlmp_link_data_indication(struct lap_cb *self, struct sk_buff *skb,
         if ((fp[0] & CONTROL_BIT) && (fp[2] == CONNECT_CMD)) {
                 IRDA_DEBUG(3, "%s(), incoming connection, "
                            "source LSAP=%d, dest LSAP=%d\n",
-                           __FUNCTION__, slsap_sel, dlsap_sel);
+                           __func__, slsap_sel, dlsap_sel);
 
                 /* Try to find LSAP among the unconnected LSAPs */
                 lsap = irlmp_find_lsap(self, dlsap_sel, slsap_sel, CONNECT_CMD,
@@ -125,7 +125,7 @@ void irlmp_link_data_indication(struct lap_cb *self, struct sk_buff *skb,
 
                 /* Maybe LSAP was already connected, so try one more time */
                 if (!lsap) {
-                        IRDA_DEBUG(1, "%s(), incoming connection for LSAP already connected\n", __FUNCTION__);
+                        IRDA_DEBUG(1, "%s(), incoming connection for LSAP already connected\n", __func__);
                         lsap = irlmp_find_lsap(self, dlsap_sel, slsap_sel, 0,
                                                self->lsaps);
                 }
@@ -136,12 +136,12 @@ void irlmp_link_data_indication(struct lap_cb *self, struct sk_buff *skb,
         if (lsap == NULL) {
                 IRDA_DEBUG(2, "IrLMP, Sorry, no LSAP for received frame!\n");
                 IRDA_DEBUG(2, "%s(), slsap_sel = %02x, dlsap_sel = %02x\n",
-                           __FUNCTION__, slsap_sel, dlsap_sel);
+                           __func__, slsap_sel, dlsap_sel);
                 if (fp[0] & CONTROL_BIT) {
                         IRDA_DEBUG(2, "%s(), received control frame %02x\n",
-                                   __FUNCTION__, fp[2]);
+                                   __func__, fp[2]);
                 } else {
-                        IRDA_DEBUG(2, "%s(), received data frame\n", __FUNCTION__);
+                        IRDA_DEBUG(2, "%s(), received data frame\n", __func__);
                 }
                 return;
         }
@@ -160,7 +160,7 @@ void irlmp_link_data_indication(struct lap_cb *self, struct sk_buff *skb,
                         break;
                 case DISCONNECT:
                         IRDA_DEBUG(4, "%s(), Disconnect indication!\n",
-                                   __FUNCTION__);
+                                   __func__);
                         irlmp_do_lsap_event(lsap, LM_DISCONNECT_INDICATION,
                                             skb);
                         break;
@@ -172,7 +172,7 @@ void irlmp_link_data_indication(struct lap_cb *self, struct sk_buff *skb,
                         break;
                 default:
                         IRDA_DEBUG(0, "%s(), Unknown control frame %02x\n",
-                                   __FUNCTION__, fp[2]);
+                                   __func__, fp[2]);
                         break;
                 }
         } else if (unreliable) {
@@ -206,7 +206,7 @@ void irlmp_link_unitdata_indication(struct lap_cb *self, struct sk_buff *skb)
         __u8   *fp;
         unsigned long flags;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(4, "%s()\n", __func__);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == LMP_LAP_MAGIC, return;);
@@ -224,13 +224,13 @@ void irlmp_link_unitdata_indication(struct lap_cb *self, struct sk_buff *skb)
 
         if (pid & 0x80) {
                 IRDA_DEBUG(0, "%s(), extension in PID not supp!\n",
-                           __FUNCTION__);
+                           __func__);
                 return;
         }
 
         /* Check if frame is addressed to the connectionless LSAP */
         if ((slsap_sel != LSAP_CONNLESS) || (dlsap_sel != LSAP_CONNLESS)) {
-                IRDA_DEBUG(0, "%s(), dropping frame!\n", __FUNCTION__);
+                IRDA_DEBUG(0, "%s(), dropping frame!\n", __func__);
                 return;
         }
 
@@ -254,7 +254,7 @@ void irlmp_link_unitdata_indication(struct lap_cb *self, struct sk_buff *skb)
         if (lsap)
                 irlmp_connless_data_indication(lsap, skb);
         else {
-                IRDA_DEBUG(0, "%s(), found no matching LSAP!\n", __FUNCTION__);
+                IRDA_DEBUG(0, "%s(), found no matching LSAP!\n", __func__);
         }
 }
 #endif /* CONFIG_IRDA_ULTRA */
@@ -270,7 +270,7 @@ void irlmp_link_disconnect_indication(struct lap_cb *lap,
                                       LAP_REASON reason,
                                       struct sk_buff *skb)
 {
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(2, "%s()\n", __func__);
 
         IRDA_ASSERT(lap != NULL, return;);
         IRDA_ASSERT(lap->magic == LMP_LAP_MAGIC, return;);
@@ -296,7 +296,7 @@ void irlmp_link_connect_indication(struct lap_cb *self, __u32 saddr,
                                    __u32 daddr, struct qos_info *qos,
                                    struct sk_buff *skb)
 {
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(4, "%s()\n", __func__);
 
         /* Copy QoS settings for this session */
         self->qos = qos;
@@ -317,7 +317,7 @@ void irlmp_link_connect_indication(struct lap_cb *self, __u32 saddr,
 void irlmp_link_connect_confirm(struct lap_cb *self, struct qos_info *qos,
                                 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 == LMP_LAP_MAGIC, return;);
@@ -383,7 +383,7 @@ void irlmp_link_discovery_indication(struct lap_cb *self,
  */
 void irlmp_link_discovery_confirm(struct lap_cb *self, hashbin_t *log)
 {
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
+        IRDA_DEBUG(4, "%s()\n", __func__);
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == LMP_LAP_MAGIC, return;);