1 files changed, 39 insertions, 39 deletions

diff --git a/net/irda/ircomm/ircomm_tty_attach.c b/net/irda/ircomm/ircomm_tty_attach.c
index b5a13882c927..9032a1d1190d 100644
--- a/net/irda/ircomm/ircomm_tty_attach.c
+++ b/net/irda/ircomm/ircomm_tty_attach.c
@@ -129,14 +129,14 @@ static int (*state[])(struct ircomm_tty_cb *self, IRCOMM_TTY_EVENT event,
  */
 int ircomm_tty_attach_cable(struct ircomm_tty_cb *self)
 {
-        IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(0, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
 
         /* Check if somebody has already connected to us */
         if (ircomm_is_connected(self->ircomm)) {
-                IRDA_DEBUG(0, "%s(), already connected!\n", __FUNCTION__ );
+                IRDA_DEBUG(0, "%s(), already connected!\n", __func__ );
                 return 0;
         }
 
@@ -158,7 +158,7 @@ int ircomm_tty_attach_cable(struct ircomm_tty_cb *self)
  */
 void ircomm_tty_detach_cable(struct ircomm_tty_cb *self)
 {
-        IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(0, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
@@ -207,7 +207,7 @@ static void ircomm_tty_ias_register(struct ircomm_tty_cb *self)
         __u8 oct_seq[6];
         __u16 hints;
 
-        IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(0, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
@@ -308,16 +308,16 @@ int ircomm_tty_send_initial_parameters(struct ircomm_tty_cb *self)
          * Set default values, but only if the application for some reason
          * haven't set them already
          */
-        IRDA_DEBUG(2, "%s(), data-rate = %d\n", __FUNCTION__ ,
+        IRDA_DEBUG(2, "%s(), data-rate = %d\n", __func__ ,
                    self->settings.data_rate);
         if (!self->settings.data_rate)
                 self->settings.data_rate = 9600;
-        IRDA_DEBUG(2, "%s(), data-format = %d\n", __FUNCTION__ ,
+        IRDA_DEBUG(2, "%s(), data-format = %d\n", __func__ ,
                    self->settings.data_format);
         if (!self->settings.data_format)
                 self->settings.data_format = IRCOMM_WSIZE_8;  /* 8N1 */
 
-        IRDA_DEBUG(2, "%s(), flow-control = %d\n", __FUNCTION__ ,
+        IRDA_DEBUG(2, "%s(), flow-control = %d\n", __func__ ,
                    self->settings.flow_control);
         /*self->settings.flow_control = IRCOMM_RTS_CTS_IN|IRCOMM_RTS_CTS_OUT;*/
 
@@ -362,7 +362,7 @@ static void ircomm_tty_discovery_indication(discinfo_t *discovery,
         struct ircomm_tty_cb *self;
         struct ircomm_tty_info info;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         /* Important note :
          * We need to drop all passive discoveries.
@@ -398,7 +398,7 @@ void ircomm_tty_disconnect_indication(void *instance, void *sap,
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
@@ -428,7 +428,7 @@ static void ircomm_tty_getvalue_confirm(int result, __u16 obj_id,
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) priv;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
@@ -439,13 +439,13 @@ static void ircomm_tty_getvalue_confirm(int result, __u16 obj_id,
 
         /* Check if request succeeded */
         if (result != IAS_SUCCESS) {
-                IRDA_DEBUG(4, "%s(), got NULL value!\n", __FUNCTION__ );
+                IRDA_DEBUG(4, "%s(), got NULL value!\n", __func__ );
                 return;
         }
 
         switch (value->type) {
         case IAS_OCT_SEQ:
-                IRDA_DEBUG(2, "%s(), got octet sequence\n", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), got octet sequence\n", __func__ );
 
                 irda_param_extract_all(self, value->t.oct_seq, value->len,
                                        &ircomm_param_info);
@@ -455,21 +455,21 @@ static void ircomm_tty_getvalue_confirm(int result, __u16 obj_id,
                 break;
         case IAS_INTEGER:
                 /* Got LSAP selector */
-                IRDA_DEBUG(2, "%s(), got lsapsel = %d\n", __FUNCTION__ ,
+                IRDA_DEBUG(2, "%s(), got lsapsel = %d\n", __func__ ,
                            value->t.integer);
 
                 if (value->t.integer == -1) {
-                        IRDA_DEBUG(0, "%s(), invalid value!\n", __FUNCTION__ );
+                        IRDA_DEBUG(0, "%s(), invalid value!\n", __func__ );
                 } else
                         self->dlsap_sel = value->t.integer;
 
                 ircomm_tty_do_event(self, IRCOMM_TTY_GOT_LSAPSEL, NULL, NULL);
                 break;
         case IAS_MISSING:
-                IRDA_DEBUG(0, "%s(), got IAS_MISSING\n", __FUNCTION__ );
+                IRDA_DEBUG(0, "%s(), got IAS_MISSING\n", __func__ );
                 break;
         default:
-                IRDA_DEBUG(0, "%s(), got unknown type!\n", __FUNCTION__ );
+                IRDA_DEBUG(0, "%s(), got unknown type!\n", __func__ );
                 break;
         }
         irias_delete_value(value);
@@ -489,7 +489,7 @@ void ircomm_tty_connect_confirm(void *instance, void *sap,
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
@@ -520,7 +520,7 @@ void ircomm_tty_connect_indication(void *instance, void *sap,
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
         int clen;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
@@ -549,7 +549,7 @@ void ircomm_tty_connect_indication(void *instance, void *sap,
  */
 void ircomm_tty_link_established(struct ircomm_tty_cb *self)
 {
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
@@ -566,10 +566,10 @@ void ircomm_tty_link_established(struct ircomm_tty_cb *self)
          * line.
          */
         if ((self->flags & ASYNC_CTS_FLOW) && ((self->settings.dce & IRCOMM_CTS) == 0)) {
-                IRDA_DEBUG(0, "%s(), waiting for CTS ...\n", __FUNCTION__ );
+                IRDA_DEBUG(0, "%s(), waiting for CTS ...\n", __func__ );
                 return;
         } else {
-                IRDA_DEBUG(1, "%s(), starting hardware!\n", __FUNCTION__ );
+                IRDA_DEBUG(1, "%s(), starting hardware!\n", __func__ );
 
                 self->tty->hw_stopped = 0;
 
@@ -607,7 +607,7 @@ static void ircomm_tty_watchdog_timer_expired(void *data)
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) data;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
@@ -628,7 +628,7 @@ int ircomm_tty_do_event(struct ircomm_tty_cb *self, IRCOMM_TTY_EVENT event,
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
 
-        IRDA_DEBUG(2, "%s: state=%s, event=%s\n", __FUNCTION__ ,
+        IRDA_DEBUG(2, "%s: state=%s, event=%s\n", __func__ ,
                    ircomm_tty_state[self->state], ircomm_tty_event[event]);
 
         return (*state[self->state])(self, event, skb, info);
@@ -646,7 +646,7 @@ static inline void ircomm_tty_next_state(struct ircomm_tty_cb *self, IRCOMM_TTY_
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
-        IRDA_DEBUG(2, "%s: next state=%s, service type=%d\n", __FUNCTION__ ,
+        IRDA_DEBUG(2, "%s: next state=%s, service type=%d\n", __func__ ,
                    ircomm_tty_state[self->state], self->service_type);
         */
         self->state = state;
@@ -665,7 +665,7 @@ static int ircomm_tty_state_idle(struct ircomm_tty_cb *self,
 {
         int ret = 0;
 
-        IRDA_DEBUG(2, "%s: state=%s, event=%s\n", __FUNCTION__ ,
+        IRDA_DEBUG(2, "%s: state=%s, event=%s\n", __func__ ,
                    ircomm_tty_state[self->state], ircomm_tty_event[event]);
         switch (event) {
         case IRCOMM_TTY_ATTACH_CABLE:
@@ -681,7 +681,7 @@ static int ircomm_tty_state_idle(struct ircomm_tty_cb *self,
 
                 if (self->iriap) {
                         IRDA_WARNING("%s(), busy with a previous query\n",
-                                     __FUNCTION__);
+                                     __func__);
                         return -EBUSY;
                 }
 
@@ -709,7 +709,7 @@ static int ircomm_tty_state_idle(struct ircomm_tty_cb *self,
                 ircomm_tty_next_state(self, IRCOMM_TTY_IDLE);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), unknown event: %s\n", __FUNCTION__ ,
+                IRDA_DEBUG(2, "%s(), unknown event: %s\n", __func__ ,
                            ircomm_tty_event[event]);
                 ret = -EINVAL;
         }
@@ -729,7 +729,7 @@ static int ircomm_tty_state_search(struct ircomm_tty_cb *self,
 {
         int ret = 0;
 
-        IRDA_DEBUG(2, "%s: state=%s, event=%s\n", __FUNCTION__ ,
+        IRDA_DEBUG(2, "%s: state=%s, event=%s\n", __func__ ,
                    ircomm_tty_state[self->state], ircomm_tty_event[event]);
 
         switch (event) {
@@ -739,7 +739,7 @@ static int ircomm_tty_state_search(struct ircomm_tty_cb *self,
 
                 if (self->iriap) {
                         IRDA_WARNING("%s(), busy with a previous query\n",
-                                     __FUNCTION__);
+                                     __func__);
                         return -EBUSY;
                 }
 
@@ -782,7 +782,7 @@ static int ircomm_tty_state_search(struct ircomm_tty_cb *self,
                 ircomm_tty_next_state(self, IRCOMM_TTY_IDLE);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), unknown event: %s\n", __FUNCTION__ ,
+                IRDA_DEBUG(2, "%s(), unknown event: %s\n", __func__ ,
                            ircomm_tty_event[event]);
                 ret = -EINVAL;
         }
@@ -802,14 +802,14 @@ static int ircomm_tty_state_query_parameters(struct ircomm_tty_cb *self,
 {
         int ret = 0;
 
-        IRDA_DEBUG(2, "%s: state=%s, event=%s\n", __FUNCTION__ ,
+        IRDA_DEBUG(2, "%s: state=%s, event=%s\n", __func__ ,
                    ircomm_tty_state[self->state], ircomm_tty_event[event]);
 
         switch (event) {
         case IRCOMM_TTY_GOT_PARAMETERS:
                 if (self->iriap) {
                         IRDA_WARNING("%s(), busy with a previous query\n",
-                                     __FUNCTION__);
+                                     __func__);
                         return -EBUSY;
                 }
 
@@ -840,7 +840,7 @@ static int ircomm_tty_state_query_parameters(struct ircomm_tty_cb *self,
                 ircomm_tty_next_state(self, IRCOMM_TTY_IDLE);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), unknown event: %s\n", __FUNCTION__ ,
+                IRDA_DEBUG(2, "%s(), unknown event: %s\n", __func__ ,
                            ircomm_tty_event[event]);
                 ret = -EINVAL;
         }
@@ -860,7 +860,7 @@ static int ircomm_tty_state_query_lsap_sel(struct ircomm_tty_cb *self,
 {
         int ret = 0;
 
-        IRDA_DEBUG(2, "%s: state=%s, event=%s\n", __FUNCTION__ ,
+        IRDA_DEBUG(2, "%s: state=%s, event=%s\n", __func__ ,
                    ircomm_tty_state[self->state], ircomm_tty_event[event]);
 
         switch (event) {
@@ -889,7 +889,7 @@ static int ircomm_tty_state_query_lsap_sel(struct ircomm_tty_cb *self,
                 ircomm_tty_next_state(self, IRCOMM_TTY_IDLE);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), unknown event: %s\n", __FUNCTION__ ,
+                IRDA_DEBUG(2, "%s(), unknown event: %s\n", __func__ ,
                            ircomm_tty_event[event]);
                 ret = -EINVAL;
         }
@@ -909,7 +909,7 @@ static int ircomm_tty_state_setup(struct ircomm_tty_cb *self,
 {
         int ret = 0;
 
-        IRDA_DEBUG(2, "%s: state=%s, event=%s\n", __FUNCTION__ ,
+        IRDA_DEBUG(2, "%s: state=%s, event=%s\n", __func__ ,
                    ircomm_tty_state[self->state], ircomm_tty_event[event]);
 
         switch (event) {
@@ -943,7 +943,7 @@ static int ircomm_tty_state_setup(struct ircomm_tty_cb *self,
                 ircomm_tty_next_state(self, IRCOMM_TTY_IDLE);
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), unknown event: %s\n", __FUNCTION__ ,
+                IRDA_DEBUG(2, "%s(), unknown event: %s\n", __func__ ,
                            ircomm_tty_event[event]);
                 ret = -EINVAL;
         }
@@ -981,13 +981,13 @@ static int ircomm_tty_state_ready(struct ircomm_tty_cb *self,
                         self->settings.dce = IRCOMM_DELTA_CD;
                         ircomm_tty_check_modem_status(self);
                 } else {
-                        IRDA_DEBUG(0, "%s(), hanging up!\n", __FUNCTION__ );
+                        IRDA_DEBUG(0, "%s(), hanging up!\n", __func__ );
                         if (self->tty)
                                 tty_hangup(self->tty);
                 }
                 break;
         default:
-                IRDA_DEBUG(2, "%s(), unknown event: %s\n", __FUNCTION__ ,
+                IRDA_DEBUG(2, "%s(), unknown event: %s\n", __func__ ,
                            ircomm_tty_event[event]);
                 ret = -EINVAL;
         }