1 files changed, 54 insertions, 54 deletions

diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index 20a680ed0cc7..87f33e06301c 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -235,10 +235,10 @@ static void setup_line(struct work_struct *work)
         unsigned long flags;
         int result;
 
-        dbg("%s(port = %d)", __FUNCTION__, port->number);
+        dbg("%s(port = %d)", __func__, port->number);
 
         if ((new_setup = kmalloc(OTI6858_CTRL_PKT_SIZE, GFP_KERNEL)) == NULL) {
-                dev_err(&port->dev, "%s(): out of memory!\n", __FUNCTION__);
+                dev_err(&port->dev, "%s(): out of memory!\n", __func__);
                 /* we will try again */
                 schedule_delayed_work(&priv->delayed_setup_work, msecs_to_jiffies(2));
                 return;
@@ -253,7 +253,7 @@ static void setup_line(struct work_struct *work)
                                 100);
 
         if (result != OTI6858_CTRL_PKT_SIZE) {
-                dev_err(&port->dev, "%s(): error reading status\n", __FUNCTION__);
+                dev_err(&port->dev, "%s(): error reading status\n", __func__);
                 kfree(new_setup);
                 /* we will try again */
                 schedule_delayed_work(&priv->delayed_setup_work, msecs_to_jiffies(2));
@@ -286,12 +286,12 @@ static void setup_line(struct work_struct *work)
         priv->setup_done = 1;
         spin_unlock_irqrestore(&priv->lock, flags);
 
-        dbg("%s(): submitting interrupt urb", __FUNCTION__);
+        dbg("%s(): submitting interrupt urb", __func__);
         port->interrupt_in_urb->dev = port->serial->dev;
         result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
         if (result != 0) {
                 dev_err(&port->dev, "%s(): usb_submit_urb() failed"
-                                " with error %d\n", __FUNCTION__, result);
+                                " with error %d\n", __func__, result);
         }
 }
 
@@ -303,7 +303,7 @@ void send_data(struct work_struct *work)
         unsigned long flags;
         unsigned char allow;
 
-        dbg("%s(port = %d)", __FUNCTION__, port->number);
+        dbg("%s(port = %d)", __func__, port->number);
 
         spin_lock_irqsave(&priv->lock, flags);
         if (priv->flags.write_urb_in_use) {
@@ -331,12 +331,12 @@ void send_data(struct work_struct *work)
         if (count == 0) {
                 priv->flags.write_urb_in_use = 0;
 
-                dbg("%s(): submitting interrupt urb", __FUNCTION__);
+                dbg("%s(): submitting interrupt urb", __func__);
                 port->interrupt_in_urb->dev = port->serial->dev;
                 result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
                 if (result != 0) {
                         dev_err(&port->dev, "%s(): usb_submit_urb() failed"
-                                " with error %d\n", __FUNCTION__, result);
+                                " with error %d\n", __func__, result);
                 }
                 return;
         }
@@ -350,7 +350,7 @@ void send_data(struct work_struct *work)
         result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
         if (result != 0) {
                 dev_err(&port->dev, "%s(): usb_submit_urb() failed"
-                               " with error %d\n", __FUNCTION__, result);
+                               " with error %d\n", __func__, result);
                 priv->flags.write_urb_in_use = 0;
         }
 
@@ -401,7 +401,7 @@ static int oti6858_write(struct usb_serial_port *port,
         struct oti6858_private *priv = usb_get_serial_port_data(port);
         unsigned long flags;
 
-        dbg("%s(port = %d, count = %d)", __FUNCTION__, port->number, count);
+        dbg("%s(port = %d, count = %d)", __func__, port->number, count);
 
         if (!count)
                 return count;
@@ -419,7 +419,7 @@ static int oti6858_write_room(struct usb_serial_port *port)
         int room = 0;
         unsigned long flags;
 
-        dbg("%s(port = %d)", __FUNCTION__, port->number);
+        dbg("%s(port = %d)", __func__, port->number);
 
         spin_lock_irqsave(&priv->lock, flags);
         room = oti6858_buf_space_avail(priv->buf);
@@ -434,7 +434,7 @@ static int oti6858_chars_in_buffer(struct usb_serial_port *port)
         int chars = 0;
         unsigned long flags;
 
-        dbg("%s(port = %d)", __FUNCTION__, port->number);
+        dbg("%s(port = %d)", __func__, port->number);
 
         spin_lock_irqsave(&priv->lock, flags);
         chars = oti6858_buf_data_avail(priv->buf);
@@ -453,10 +453,10 @@ static void oti6858_set_termios(struct usb_serial_port *port,
         u16 divisor;
         int br;
 
-        dbg("%s(port = %d)", __FUNCTION__, port->number);
+        dbg("%s(port = %d)", __func__, port->number);
 
         if (!port->tty || !port->tty->termios) {
-                dbg("%s(): no tty structures", __FUNCTION__);
+                dbg("%s(): no tty structures", __func__);
                 return;
         }
 
@@ -572,7 +572,7 @@ static int oti6858_open(struct usb_serial_port *port, struct file *filp)
         unsigned long flags;
         int result;
 
-        dbg("%s(port = %d)", __FUNCTION__, port->number);
+        dbg("%s(port = %d)", __func__, port->number);
 
         usb_clear_halt(serial->dev, port->write_urb->pipe);
         usb_clear_halt(serial->dev, port->read_urb->pipe);
@@ -581,7 +581,7 @@ static int oti6858_open(struct usb_serial_port *port, struct file *filp)
                 return 0;
 
         if ((buf = kmalloc(OTI6858_CTRL_PKT_SIZE, GFP_KERNEL)) == NULL) {
-                dev_err(&port->dev, "%s(): out of memory!\n", __FUNCTION__);
+                dev_err(&port->dev, "%s(): out of memory!\n", __func__);
                 return -ENOMEM;
         }
 
@@ -610,12 +610,12 @@ static int oti6858_open(struct usb_serial_port *port, struct file *filp)
         spin_unlock_irqrestore(&priv->lock, flags);
         kfree(buf);
 
-        dbg("%s(): submitting interrupt urb", __FUNCTION__);
+        dbg("%s(): submitting interrupt urb", __func__);
         port->interrupt_in_urb->dev = serial->dev;
         result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
         if (result != 0) {
                 dev_err(&port->dev, "%s(): usb_submit_urb() failed"
-                               " with error %d\n", __FUNCTION__, result);
+                               " with error %d\n", __func__, result);
                 oti6858_close(port, NULL);
                 return -EPROTO;
         }
@@ -634,14 +634,14 @@ static void oti6858_close(struct usb_serial_port *port, struct file *filp)
         long timeout;
         wait_queue_t wait;
 
-        dbg("%s(port = %d)", __FUNCTION__, port->number);
+        dbg("%s(port = %d)", __func__, port->number);
 
         /* wait for data to drain from the buffer */
         spin_lock_irqsave(&priv->lock, flags);
         timeout = 30 * HZ;      /* PL2303_CLOSING_WAIT */
         init_waitqueue_entry(&wait, current);
         add_wait_queue(&port->tty->write_wait, &wait);
-        dbg("%s(): entering wait loop", __FUNCTION__);
+        dbg("%s(): entering wait loop", __func__);
         for (;;) {
                 set_current_state(TASK_INTERRUPTIBLE);
                 if (oti6858_buf_data_avail(priv->buf) == 0
@@ -654,7 +654,7 @@ static void oti6858_close(struct usb_serial_port *port, struct file *filp)
         }
         set_current_state(TASK_RUNNING);
         remove_wait_queue(&port->tty->write_wait, &wait);
-        dbg("%s(): after wait loop", __FUNCTION__);
+        dbg("%s(): after wait loop", __func__);
 
         /* clear out any remaining data in the buffer */
         oti6858_buf_clear(priv->buf);
@@ -675,7 +675,7 @@ static void oti6858_close(struct usb_serial_port *port, struct file *filp)
         */
                 timeout = 2*HZ;
         schedule_timeout_interruptible(timeout);
-        dbg("%s(): after schedule_timeout_interruptible()", __FUNCTION__);
+        dbg("%s(): after schedule_timeout_interruptible()", __func__);
 
         /* cancel scheduled setup */
         cancel_delayed_work(&priv->delayed_setup_work);
@@ -683,7 +683,7 @@ static void oti6858_close(struct usb_serial_port *port, struct file *filp)
         flush_scheduled_work();
 
         /* shutdown our urbs */
-        dbg("%s(): shutting down urbs", __FUNCTION__);
+        dbg("%s(): shutting down urbs", __func__);
         usb_kill_urb(port->write_urb);
         usb_kill_urb(port->read_urb);
         usb_kill_urb(port->interrupt_in_urb);
@@ -706,7 +706,7 @@ static int oti6858_tiocmset(struct usb_serial_port *port, struct file *file,
         u8 control;
 
         dbg("%s(port = %d, set = 0x%08x, clear = 0x%08x)",
-                                __FUNCTION__, port->number, set, clear);
+                                __func__, port->number, set, clear);
 
         if (!usb_get_intfdata(port->serial->interface))
                 return -ENODEV;
@@ -738,7 +738,7 @@ static int oti6858_tiocmget(struct usb_serial_port *port, struct file *file)
         unsigned pin_state;
         unsigned result = 0;
 
-        dbg("%s(port = %d)", __FUNCTION__, port->number);
+        dbg("%s(port = %d)", __func__, port->number);
 
         if (!usb_get_intfdata(port->serial->interface))
                 return -ENODEV;
@@ -761,7 +761,7 @@ static int oti6858_tiocmget(struct usb_serial_port *port, struct file *file)
         if ((pin_state & PIN_DCD) != 0)
                 result |= TIOCM_CD;
 
-        dbg("%s() = 0x%08x", __FUNCTION__, result);
+        dbg("%s() = 0x%08x", __func__, result);
 
         return result;
 }
@@ -808,7 +808,7 @@ static int oti6858_ioctl(struct usb_serial_port *port, struct file *file,
         unsigned int x;
 
         dbg("%s(port = %d, cmd = 0x%04x, arg = 0x%08lx)",
-                                __FUNCTION__, port->number, cmd, arg);
+                                __func__, port->number, cmd, arg);
 
         switch (cmd) {
                 case TIOCMBIS:
@@ -822,11 +822,11 @@ static int oti6858_ioctl(struct usb_serial_port *port, struct file *file,
                         return oti6858_tiocmset(port, NULL, 0, x);
 
                 case TIOCMIWAIT:
-                        dbg("%s(): TIOCMIWAIT", __FUNCTION__);
+                        dbg("%s(): TIOCMIWAIT", __func__);
                         return wait_modem_info(port, arg);
 
                 default:
-                        dbg("%s(): 0x%04x not supported", __FUNCTION__, cmd);
+                        dbg("%s(): 0x%04x not supported", __func__, cmd);
                         break;
         }
 
@@ -837,10 +837,10 @@ static void oti6858_break_ctl(struct usb_serial_port *port, int break_state)
 {
         int state;
 
-        dbg("%s(port = %d)", __FUNCTION__, port->number);
+        dbg("%s(port = %d)", __func__, port->number);
 
         state = (break_state == 0) ? 0 : 1;
-        dbg("%s(): turning break %s", __FUNCTION__, state ? "on" : "off");
+        dbg("%s(): turning break %s", __func__, state ? "on" : "off");
 
         /* FIXME */
 /*
@@ -848,7 +848,7 @@ static void oti6858_break_ctl(struct usb_serial_port *port, int break_state)
                                   BREAK_REQUEST, BREAK_REQUEST_TYPE, state,
                                   0, NULL, 0, 100);
         if (result != 0)
-                dbg("%s(): error sending break", __FUNCTION__);
+                dbg("%s(): error sending break", __func__);
  */
 }
 
@@ -857,7 +857,7 @@ static void oti6858_shutdown(struct usb_serial *serial)
         struct oti6858_private *priv;
         int i;
 
-        dbg("%s()", __FUNCTION__);
+        dbg("%s()", __func__);
 
         for (i = 0; i < serial->num_ports; ++i) {
                 priv = usb_get_serial_port_data(serial->port[i]);
@@ -877,7 +877,7 @@ static void oti6858_read_int_callback(struct urb *urb)
         int status = urb->status;
 
         dbg("%s(port = %d, status = %d)",
-                                __FUNCTION__, port->number, status);
+                                __func__, port->number, status);
 
         switch (status) {
         case 0:
@@ -888,11 +888,11 @@ static void oti6858_read_int_callback(struct urb *urb)
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
                 dbg("%s(): urb shutting down with status: %d",
-                                        __FUNCTION__, status);
+                                        __func__, status);
                 return;
         default:
                 dbg("%s(): nonzero urb status received: %d",
-                                        __FUNCTION__, status);
+                                        __func__, status);
                 break;
         }
 
@@ -909,7 +909,7 @@ static void oti6858_read_int_callback(struct urb *urb)
                                         priv->setup_done = 0;
                                         resubmit = 0;
                                         dbg("%s(): scheduling setup_line()",
-                                            __FUNCTION__);
+                                            __func__);
                                         schedule_delayed_work(&priv->delayed_setup_work, 0);
                                 }
                         }
@@ -924,7 +924,7 @@ static void oti6858_read_int_callback(struct urb *urb)
                                         priv->setup_done = 0;
                                         resubmit = 0;
                                         dbg("%s(): scheduling setup_line()",
-                                            __FUNCTION__);
+                                            __func__);
                                         schedule_delayed_work(&priv->delayed_setup_work, 0);
                                 }
                         }
@@ -953,7 +953,7 @@ static void oti6858_read_int_callback(struct urb *urb)
                 if (result != 0) {
                         priv->flags.read_urb_in_use = 0;
                         dev_err(&port->dev, "%s(): usb_submit_urb() failed,"
-                                        " error %d\n", __FUNCTION__, result);
+                                        " error %d\n", __func__, result);
                 } else {
                         resubmit = 0;
                 }
@@ -972,13 +972,13 @@ static void oti6858_read_int_callback(struct urb *urb)
         if (resubmit) {
                 int result;
 
-//              dbg("%s(): submitting interrupt urb", __FUNCTION__);
+//              dbg("%s(): submitting interrupt urb", __func__);
                 urb->dev = port->serial->dev;
                 result = usb_submit_urb(urb, GFP_ATOMIC);
                 if (result != 0) {
                         dev_err(&urb->dev->dev,
                                         "%s(): usb_submit_urb() failed with"
-                                        " error %d\n", __FUNCTION__, result);
+                                        " error %d\n", __func__, result);
                 }
         }
 }
@@ -994,7 +994,7 @@ static void oti6858_read_bulk_callback(struct urb *urb)
         int result;
 
         dbg("%s(port = %d, status = %d)",
-                                __FUNCTION__, port->number, status);
+                                __func__, port->number, status);
 
         spin_lock_irqsave(&priv->lock, flags);
         priv->flags.read_urb_in_use = 0;
@@ -1002,20 +1002,20 @@ static void oti6858_read_bulk_callback(struct urb *urb)
 
         if (status != 0) {
                 if (!port->open_count) {
-                        dbg("%s(): port is closed, exiting", __FUNCTION__);
+                        dbg("%s(): port is closed, exiting", __func__);
                         return;
                 }
                 /*
                 if (status == -EPROTO) {
                         // PL2303 mysteriously fails with -EPROTO reschedule the read
-                        dbg("%s - caught -EPROTO, resubmitting the urb", __FUNCTION__);
+                        dbg("%s - caught -EPROTO, resubmitting the urb", __func__);
                         result = usb_submit_urb(urb, GFP_ATOMIC);
                         if (result)
-                                dev_err(&urb->dev->dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result);
+                                dev_err(&urb->dev->dev, "%s - failed resubmitting read urb, error %d\n", __func__, result);
                         return;
                 }
                 */
-                dbg("%s(): unable to handle the error, exiting", __FUNCTION__);
+                dbg("%s(): unable to handle the error, exiting", __func__);
                 return;
         }
 
@@ -1031,7 +1031,7 @@ static void oti6858_read_bulk_callback(struct urb *urb)
                 result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
                 if (result != 0) {
                         dev_err(&port->dev, "%s(): usb_submit_urb() failed,"
-                                        " error %d\n", __FUNCTION__, result);
+                                        " error %d\n", __func__, result);
                 }
         }
 }
@@ -1044,7 +1044,7 @@ static void oti6858_write_bulk_callback(struct urb *urb)
         int result;
 
         dbg("%s(port = %d, status = %d)",
-                                __FUNCTION__, port->number, status);
+                                __func__, port->number, status);
 
         switch (status) {
         case 0:
@@ -1055,21 +1055,21 @@ static void oti6858_write_bulk_callback(struct urb *urb)
         case -ESHUTDOWN:
                 /* this urb is terminated, clean up */
                 dbg("%s(): urb shutting down with status: %d",
-                                        __FUNCTION__, status);
+                                        __func__, status);
                 priv->flags.write_urb_in_use = 0;
                 return;
         default:
                 /* error in the urb, so we have to resubmit it */
                 dbg("%s(): nonzero write bulk status received: %d",
-                                        __FUNCTION__, status);
-                dbg("%s(): overflow in write", __FUNCTION__);
+                                        __func__, status);
+                dbg("%s(): overflow in write", __func__);
 
                 port->write_urb->transfer_buffer_length = 1;
                 port->write_urb->dev = port->serial->dev;
                 result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
                 if (result) {
                         dev_err(&port->dev, "%s(): usb_submit_urb() failed,"
-                                        " error %d\n", __FUNCTION__, result);
+                                        " error %d\n", __func__, result);
                 } else {
                         return;
                 }
@@ -1079,11 +1079,11 @@ static void oti6858_write_bulk_callback(struct urb *urb)
 
         // schedule the interrupt urb if we are still open */
         port->interrupt_in_urb->dev = port->serial->dev;
-        dbg("%s(): submitting interrupt urb", __FUNCTION__);
+        dbg("%s(): submitting interrupt urb", __func__);
         result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
         if (result != 0) {
                 dev_err(&port->dev, "%s(): failed submitting int urb,"
-                                        " error %d\n", __FUNCTION__, result);
+                                        " error %d\n", __func__, result);
         }
 }