1 files changed, 45 insertions, 45 deletions

diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index be627e1f04d8..d2620410cb0a 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -115,7 +115,7 @@ static int __init ircomm_tty_init(void)
                 return -ENOMEM;
         ircomm_tty = hashbin_new(HB_LOCK);
         if (ircomm_tty == NULL) {
-                IRDA_ERROR("%s(), can't allocate hashbin!\n", __FUNCTION__);
+                IRDA_ERROR("%s(), can't allocate hashbin!\n", __func__);
                 put_tty_driver(driver);
                 return -ENOMEM;
         }
@@ -133,7 +133,7 @@ static int __init ircomm_tty_init(void)
         tty_set_operations(driver, &ops);
         if (tty_register_driver(driver)) {
                 IRDA_ERROR("%s(): Couldn't register serial driver\n",
-                           __FUNCTION__);
+                           __func__);
                 put_tty_driver(driver);
                 return -1;
         }
@@ -142,7 +142,7 @@ static int __init ircomm_tty_init(void)
 
 static void __exit __ircomm_tty_cleanup(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;);
@@ -163,12 +163,12 @@ static void __exit ircomm_tty_cleanup(void)
 {
         int ret;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         ret = tty_unregister_driver(driver);
         if (ret) {
                 IRDA_ERROR("%s(), failed to unregister driver\n",
-                           __FUNCTION__);
+                           __func__);
                 return;
         }
 
@@ -187,14 +187,14 @@ static int ircomm_tty_startup(struct ircomm_tty_cb *self)
         notify_t notify;
         int ret = -ENODEV;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
 
         /* Check if already open */
         if (test_and_set_bit(ASYNC_B_INITIALIZED, &self->flags)) {
-                IRDA_DEBUG(2, "%s(), already open so break out!\n", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), already open so break out!\n", __func__ );
                 return 0;
         }
 
@@ -224,7 +224,7 @@ static int ircomm_tty_startup(struct ircomm_tty_cb *self)
         /* Connect IrCOMM link with remote device */
         ret = ircomm_tty_attach_cable(self);
         if (ret < 0) {
-                IRDA_ERROR("%s(), error attaching cable!\n", __FUNCTION__);
+                IRDA_ERROR("%s(), error attaching cable!\n", __func__);
                 goto err;
         }
 
@@ -249,7 +249,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
         unsigned long   flags;
         struct tty_struct *tty;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         tty = self->tty;
 
@@ -260,12 +260,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
         if (filp->f_flags & O_NONBLOCK || tty->flags & (1 << TTY_IO_ERROR)){
                 /* nonblock mode is set or port is not enabled */
                 self->flags |= ASYNC_NORMAL_ACTIVE;
-                IRDA_DEBUG(1, "%s(), O_NONBLOCK requested!\n", __FUNCTION__ );
+                IRDA_DEBUG(1, "%s(), O_NONBLOCK requested!\n", __func__ );
                 return 0;
         }
 
         if (tty->termios->c_cflag & CLOCAL) {
-                IRDA_DEBUG(1, "%s(), doing CLOCAL!\n", __FUNCTION__ );
+                IRDA_DEBUG(1, "%s(), doing CLOCAL!\n", __func__ );
                 do_clocal = 1;
         }
 
@@ -368,7 +368,7 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
         unsigned long   flags;
         int ret;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         line = tty->index;
         if ((line < 0) || (line >= IRCOMM_TTY_PORTS)) {
@@ -381,7 +381,7 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
                 /* No, so make new instance */
                 self = kzalloc(sizeof(struct ircomm_tty_cb), GFP_KERNEL);
                 if (self == NULL) {
-                        IRDA_ERROR("%s(), kmalloc failed!\n", __FUNCTION__);
+                        IRDA_ERROR("%s(), kmalloc failed!\n", __func__);
                         return -ENOMEM;
                 }
 
@@ -420,7 +420,7 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
         self->tty = tty;
         spin_unlock_irqrestore(&self->spinlock, flags);
 
-        IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __FUNCTION__ , tty->driver->name,
+        IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
                    self->line, self->open_count);
 
         /* Not really used by us, but lets do it anyway */
@@ -442,7 +442,7 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
 
                 if (wait_event_interruptible(self->close_wait, !test_bit(ASYNC_B_CLOSING, &self->flags))) {
                         IRDA_WARNING("%s - got signal while blocking on ASYNC_CLOSING!\n",
-                                     __FUNCTION__);
+                                     __func__);
                         return -ERESTARTSYS;
                 }
 
@@ -460,9 +460,9 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
                 self->settings.service_type = IRCOMM_9_WIRE; /* 9 wire as default */
                 /* Jan Kiszka -> add DSR/RI -> Conform to IrCOMM spec */
                 self->settings.dce = IRCOMM_CTS | IRCOMM_CD | IRCOMM_DSR | IRCOMM_RI; /* Default line settings */
-                IRDA_DEBUG(2, "%s(), IrCOMM device\n", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), IrCOMM device\n", __func__ );
         } else {
-                IRDA_DEBUG(2, "%s(), IrLPT device\n", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), IrLPT device\n", __func__ );
                 self->service_type = IRCOMM_3_WIRE_RAW;
                 self->settings.service_type = IRCOMM_3_WIRE_RAW; /* Default */
         }
@@ -474,7 +474,7 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
         ret = ircomm_tty_block_til_ready(self, filp);
         if (ret) {
                 IRDA_DEBUG(2,
-                      "%s(), returning after block_til_ready with %d\n", __FUNCTION__ ,
+                      "%s(), returning after block_til_ready with %d\n", __func__ ,
                       ret);
 
                 return ret;
@@ -493,7 +493,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
         unsigned long flags;
 
-        IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(0, "%s()\n", __func__ );
 
         if (!tty)
                 return;
@@ -506,7 +506,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
         if (tty_hung_up_p(filp)) {
                 spin_unlock_irqrestore(&self->spinlock, flags);
 
-                IRDA_DEBUG(0, "%s(), returning 1\n", __FUNCTION__ );
+                IRDA_DEBUG(0, "%s(), returning 1\n", __func__ );
                 return;
         }
 
@@ -519,20 +519,20 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
                  * serial port won't be shutdown.
                  */
                 IRDA_DEBUG(0, "%s(), bad serial port count; "
-                           "tty->count is 1, state->count is %d\n", __FUNCTION__ ,
+                           "tty->count is 1, state->count is %d\n", __func__ ,
                            self->open_count);
                 self->open_count = 1;
         }
 
         if (--self->open_count < 0) {
                 IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
-                           __FUNCTION__, self->line, self->open_count);
+                           __func__, self->line, self->open_count);
                 self->open_count = 0;
         }
         if (self->open_count) {
                 spin_unlock_irqrestore(&self->spinlock, flags);
 
-                IRDA_DEBUG(0, "%s(), open count > 0\n", __FUNCTION__ );
+                IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
                 return;
         }
 
@@ -608,7 +608,7 @@ static void ircomm_tty_do_softint(struct work_struct *work)
         unsigned long flags;
         struct sk_buff *skb, *ctrl_skb;
 
-        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(2, "%s()\n", __func__ );
 
         if (!self || self->magic != IRCOMM_TTY_MAGIC)
                 return;
@@ -678,7 +678,7 @@ static int ircomm_tty_write(struct tty_struct *tty,
         int len = 0;
         int size;
 
-        IRDA_DEBUG(2, "%s(), count=%d, hw_stopped=%d\n", __FUNCTION__ , count,
+        IRDA_DEBUG(2, "%s(), count=%d, hw_stopped=%d\n", __func__ , count,
                    tty->hw_stopped);
 
         IRDA_ASSERT(self != NULL, return -1;);
@@ -701,7 +701,7 @@ static int ircomm_tty_write(struct tty_struct *tty,
          * we don't mess up the original "safe skb" (see tx_data_size).
          * Jean II */
         if (self->max_header_size == IRCOMM_TTY_HDR_UNINITIALISED) {
-                IRDA_DEBUG(1, "%s() : not initialised\n", __FUNCTION__);
+                IRDA_DEBUG(1, "%s() : not initialised\n", __func__);
 #ifdef IRCOMM_NO_TX_BEFORE_INIT
                 /* We didn't consume anything, TTY will retry */
                 return 0;
@@ -830,7 +830,7 @@ static int ircomm_tty_write_room(struct tty_struct *tty)
                         ret = self->max_data_size;
                 spin_unlock_irqrestore(&self->spinlock, flags);
         }
-        IRDA_DEBUG(2, "%s(), ret=%d\n", __FUNCTION__ , ret);
+        IRDA_DEBUG(2, "%s(), ret=%d\n", __func__ , ret);
 
         return ret;
 }
@@ -847,7 +847,7 @@ static void ircomm_tty_wait_until_sent(struct tty_struct *tty, int timeout)
         unsigned long orig_jiffies, poll_time;
         unsigned long flags;
 
-        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;);
@@ -882,7 +882,7 @@ static void ircomm_tty_throttle(struct tty_struct *tty)
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_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;);
@@ -913,7 +913,7 @@ static void ircomm_tty_unthrottle(struct tty_struct *tty)
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_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;);
@@ -928,7 +928,7 @@ static void ircomm_tty_unthrottle(struct tty_struct *tty)
                 self->settings.dte |= (IRCOMM_RTS|IRCOMM_DELTA_RTS);
 
                 ircomm_param_request(self, IRCOMM_DTE, TRUE);
-                IRDA_DEBUG(1, "%s(), FLOW_START\n", __FUNCTION__ );
+                IRDA_DEBUG(1, "%s(), FLOW_START\n", __func__ );
         }
         ircomm_flow_request(self->ircomm, FLOW_START);
 }
@@ -965,7 +965,7 @@ static void ircomm_tty_shutdown(struct ircomm_tty_cb *self)
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
-        IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(0, "%s()\n", __func__ );
 
         if (!test_and_clear_bit(ASYNC_B_INITIALIZED, &self->flags))
                 return;
@@ -1008,7 +1008,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
         unsigned long   flags;
 
-        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;);
@@ -1037,7 +1037,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
  */
 static void ircomm_tty_send_xchar(struct tty_struct *tty, char ch)
 {
-        IRDA_DEBUG(0, "%s(), not impl\n", __FUNCTION__ );
+        IRDA_DEBUG(0, "%s(), not impl\n", __func__ );
 }
 
 /*
@@ -1081,7 +1081,7 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
         struct tty_struct *tty;
         int status;
 
-        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;);
@@ -1095,14 +1095,14 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
         }
         if ((self->flags & ASYNC_CHECK_CD) && (status & IRCOMM_DELTA_CD)) {
                 IRDA_DEBUG(2,
-                           "%s(), ircomm%d CD now %s...\n", __FUNCTION__ , self->line,
+                           "%s(), ircomm%d CD now %s...\n", __func__ , self->line,
                            (status & IRCOMM_CD) ? "on" : "off");
 
                 if (status & IRCOMM_CD) {
                         wake_up_interruptible(&self->open_wait);
                 } else {
                         IRDA_DEBUG(2,
-                                   "%s(), Doing serial hangup..\n", __FUNCTION__ );
+                                   "%s(), Doing serial hangup..\n", __func__ );
                         if (tty)
                                 tty_hangup(tty);
 
@@ -1114,7 +1114,7 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
                 if (tty->hw_stopped) {
                         if (status & IRCOMM_CTS) {
                                 IRDA_DEBUG(2,
-                                           "%s(), CTS tx start...\n", __FUNCTION__ );
+                                           "%s(), CTS tx start...\n", __func__ );
                                 tty->hw_stopped = 0;
 
                                 /* Wake up processes blocked on open */
@@ -1126,7 +1126,7 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
                 } else {
                         if (!(status & IRCOMM_CTS)) {
                                 IRDA_DEBUG(2,
-                                           "%s(), CTS tx stop...\n", __FUNCTION__ );
+                                           "%s(), CTS tx stop...\n", __func__ );
                                 tty->hw_stopped = 1;
                         }
                 }
@@ -1144,14 +1144,14 @@ static int ircomm_tty_data_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 -1;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
         IRDA_ASSERT(skb != NULL, return -1;);
 
         if (!self->tty) {
-                IRDA_DEBUG(0, "%s(), no tty!\n", __FUNCTION__ );
+                IRDA_DEBUG(0, "%s(), no tty!\n", __func__ );
                 return 0;
         }
 
@@ -1162,7 +1162,7 @@ static int ircomm_tty_data_indication(void *instance, void *sap,
          * params, we can just as well declare the hardware for running.
          */
         if (self->tty->hw_stopped && (self->flow == FLOW_START)) {
-                IRDA_DEBUG(0, "%s(), polling for line settings!\n", __FUNCTION__ );
+                IRDA_DEBUG(0, "%s(), polling for line settings!\n", __func__ );
                 ircomm_param_request(self, IRCOMM_POLL, TRUE);
 
                 /* We can just as well declare the hardware for running */
@@ -1194,7 +1194,7 @@ static int ircomm_tty_control_indication(void *instance, void *sap,
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) instance;
         int clen;
 
-        IRDA_DEBUG(4, "%s()\n", __FUNCTION__ );
+        IRDA_DEBUG(4, "%s()\n", __func__ );
 
         IRDA_ASSERT(self != NULL, return -1;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
@@ -1230,7 +1230,7 @@ static void ircomm_tty_flow_indication(void *instance, void *sap,
 
         switch (cmd) {
         case FLOW_START:
-                IRDA_DEBUG(2, "%s(), hw start!\n", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), hw start!\n", __func__ );
                 tty->hw_stopped = 0;
 
                 /* ircomm_tty_do_softint will take care of the rest */
@@ -1238,7 +1238,7 @@ static void ircomm_tty_flow_indication(void *instance, void *sap,
                 break;
         default:  /* If we get here, something is very wrong, better stop */
         case FLOW_STOP:
-                IRDA_DEBUG(2, "%s(), hw stopped!\n", __FUNCTION__ );
+                IRDA_DEBUG(2, "%s(), hw stopped!\n", __func__ );
                 tty->hw_stopped = 1;
                 break;
         }