USB: replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 52 insertions, 52 deletions

diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index c5af57be62f4..fb02424de4a0 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -282,7 +282,7 @@ static int whiteheat_firmware_download (struct usb_serial *serial, const struct
         int response;
         const struct whiteheat_hex_record *record;
         
-        dbg("%s", __FUNCTION__);
+        dbg("%s", __func__);
         
         response = ezusb_set_reset (serial, 1);
 
@@ -292,7 +292,7 @@ static int whiteheat_firmware_download (struct usb_serial *serial, const struct
                                 (unsigned char *)record->data, record->data_size, 0xa0);
                 if (response < 0) {
                         err("%s - ezusb_writememory failed for loader (%d %04X %p %d)",
-                                __FUNCTION__, response, record->address, record->data, record->data_size);
+                                __func__, response, record->address, record->data, record->data_size);
                         break;
                 }
                 ++record;
@@ -309,7 +309,7 @@ static int whiteheat_firmware_download (struct usb_serial *serial, const struct
                                 (unsigned char *)record->data, record->data_size, 0xa3);
                 if (response < 0) {
                         err("%s - ezusb_writememory failed for first firmware step (%d %04X %p %d)", 
-                                __FUNCTION__, response, record->address, record->data, record->data_size);
+                                __func__, response, record->address, record->data, record->data_size);
                         break;
                 }
                 ++record;
@@ -323,7 +323,7 @@ static int whiteheat_firmware_download (struct usb_serial *serial, const struct
                                 (unsigned char *)record->data, record->data_size, 0xa0);
                 if (response < 0) {
                         err("%s - ezusb_writememory failed for second firmware step (%d %04X %p %d)", 
-                                __FUNCTION__, response, record->address, record->data, record->data_size);
+                                __func__, response, record->address, record->data, record->data_size);
                         break;
                 }
                 ++record;
@@ -561,7 +561,7 @@ static void whiteheat_shutdown (struct usb_serial *serial)
         struct list_head *tmp2;
         int i;
 
-        dbg("%s", __FUNCTION__);
+        dbg("%s", __func__);
 
         /* free up our private data for our command port */
         command_port = serial->port[COMMAND_PORT];
@@ -598,7 +598,7 @@ static int whiteheat_open (struct usb_serial_port *port, struct file *filp)
         int             retval = 0;
         struct ktermios old_term;
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+        dbg("%s - port %d", __func__, port->number);
 
         retval = start_command_port(port->serial);
         if (retval)
@@ -631,14 +631,14 @@ static int whiteheat_open (struct usb_serial_port *port, struct file *filp)
         /* Start reading from the device */
         retval = start_port_read(port);
         if (retval) {
-                err("%s - failed submitting read urb, error %d", __FUNCTION__, retval);
+                err("%s - failed submitting read urb, error %d", __func__, retval);
                 firm_close(port);
                 stop_command_port(port->serial);
                 goto exit;
         }
 
 exit:
-        dbg("%s - exit, retval = %d", __FUNCTION__, retval);
+        dbg("%s - exit, retval = %d", __func__, retval);
         return retval;
 }
 
@@ -651,7 +651,7 @@ static void whiteheat_close(struct usb_serial_port *port, struct file * filp)
         struct list_head *tmp;
         struct list_head *tmp2;
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+        dbg("%s - port %d", __func__, port->number);
 
         mutex_lock(&port->serial->disc_mutex);
         /* filp is NULL when called from usb_serial_disconnect */
@@ -726,10 +726,10 @@ static int whiteheat_write(struct usb_serial_port *port, const unsigned char *bu
         unsigned long flags;
         struct list_head *tmp;
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+        dbg("%s - port %d", __func__, port->number);
 
         if (count == 0) {
-                dbg("%s - write request of 0 bytes", __FUNCTION__);
+                dbg("%s - write request of 0 bytes", __func__);
                 return (0);
         }
 
@@ -748,13 +748,13 @@ static int whiteheat_write(struct usb_serial_port *port, const unsigned char *bu
                 bytes = (count > port->bulk_out_size) ? port->bulk_out_size : count;
                 memcpy (urb->transfer_buffer, buf + sent, bytes);
 
-                usb_serial_debug_data(debug, &port->dev, __FUNCTION__, bytes, urb->transfer_buffer);
+                usb_serial_debug_data(debug, &port->dev, __func__, bytes, urb->transfer_buffer);
 
                 urb->dev = serial->dev;
                 urb->transfer_buffer_length = bytes;
                 result = usb_submit_urb(urb, GFP_ATOMIC);
                 if (result) {
-                        err("%s - failed submitting write urb, error %d", __FUNCTION__, result);
+                        err("%s - failed submitting write urb, error %d", __func__, result);
                         sent = result;
                         spin_lock_irqsave(&info->lock, flags);
                         list_add(tmp, &info->tx_urbs_free);
@@ -780,7 +780,7 @@ static int whiteheat_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(&info->lock, flags);
         list_for_each(tmp, &info->tx_urbs_free)
@@ -788,7 +788,7 @@ static int whiteheat_write_room(struct usb_serial_port *port)
         spin_unlock_irqrestore(&info->lock, flags);
         room *= port->bulk_out_size;
 
-        dbg("%s - returns %d", __FUNCTION__, room);
+        dbg("%s - returns %d", __func__, room);
         return (room);
 }
 
@@ -798,7 +798,7 @@ static int whiteheat_tiocmget (struct usb_serial_port *port, struct file *file)
         struct whiteheat_private *info = usb_get_serial_port_data(port);
         unsigned int modem_signals = 0;
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+        dbg("%s - port %d", __func__, port->number);
 
         firm_get_dtr_rts(port);
         if (info->mcr & UART_MCR_DTR)
@@ -815,7 +815,7 @@ static int whiteheat_tiocmset (struct usb_serial_port *port, struct file *file,
 {
         struct whiteheat_private *info = usb_get_serial_port_data(port);
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+        dbg("%s - port %d", __func__, port->number);
 
         if (set & TIOCM_RTS)
                 info->mcr |= UART_MCR_RTS;
@@ -838,7 +838,7 @@ static int whiteheat_ioctl (struct usb_serial_port *port, struct file * file, un
         struct serial_struct serstruct;
         void __user *user_arg = (void __user *)arg;
 
-        dbg("%s - port %d, cmd 0x%.4x", __FUNCTION__, port->number, cmd);
+        dbg("%s - port %d, cmd 0x%.4x", __func__, port->number, cmd);
 
         switch (cmd) {
                 case TIOCGSERIAL:
@@ -880,7 +880,7 @@ static int whiteheat_ioctl (struct usb_serial_port *port, struct file * file, un
 
 static void whiteheat_set_termios(struct usb_serial_port *port, struct ktermios *old_termios)
 {
-        dbg("%s -port %d", __FUNCTION__, port->number);
+        dbg("%s -port %d", __func__, port->number);
         firm_setup_port(port);
 }
 
@@ -898,7 +898,7 @@ static int whiteheat_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(&info->lock, flags);
         list_for_each(tmp, &info->tx_urbs_submitted) {
@@ -907,7 +907,7 @@ static int whiteheat_chars_in_buffer(struct usb_serial_port *port)
         }
         spin_unlock_irqrestore(&info->lock, flags);
 
-        dbg ("%s - returns %d", __FUNCTION__, chars);
+        dbg ("%s - returns %d", __func__, chars);
         return chars;
 }
 
@@ -917,7 +917,7 @@ static void whiteheat_throttle (struct usb_serial_port *port)
         struct whiteheat_private *info = usb_get_serial_port_data(port);
         unsigned long flags;
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+        dbg("%s - port %d", __func__, port->number);
 
         spin_lock_irqsave(&info->lock, flags);
         info->flags |= THROTTLED;
@@ -933,7 +933,7 @@ static void whiteheat_unthrottle (struct usb_serial_port *port)
         int actually_throttled;
         unsigned long flags;
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+        dbg("%s - port %d", __func__, port->number);
 
         spin_lock_irqsave(&info->lock, flags);
         actually_throttled = info->flags & ACTUALLY_THROTTLED;
@@ -954,7 +954,7 @@ static void command_port_write_callback(struct urb *urb)
 {
         int status = urb->status;
 
-        dbg("%s", __FUNCTION__);
+        dbg("%s", __func__);
 
         if (status) {
                 dbg("nonzero urb status: %d", status);
@@ -971,22 +971,22 @@ static void command_port_read_callback(struct urb *urb)
         unsigned char *data = urb->transfer_buffer;
         int result;
 
-        dbg("%s", __FUNCTION__);
+        dbg("%s", __func__);
 
         command_info = usb_get_serial_port_data(command_port);
         if (!command_info) {
-                dbg ("%s - command_info is NULL, exiting.", __FUNCTION__);
+                dbg ("%s - command_info is NULL, exiting.", __func__);
                 return;
         }
         if (status) {
-                dbg("%s - nonzero urb status: %d", __FUNCTION__, status);
+                dbg("%s - nonzero urb status: %d", __func__, status);
                 if (status != -ENOENT)
                         command_info->command_finished = WHITEHEAT_CMD_FAILURE;
                 wake_up(&command_info->wait_command);
                 return;
         }
 
-        usb_serial_debug_data(debug, &command_port->dev, __FUNCTION__, urb->actual_length, data);
+        usb_serial_debug_data(debug, &command_port->dev, __func__, urb->actual_length, data);
 
         if (data[0] == WHITEHEAT_CMD_COMPLETE) {
                 command_info->command_finished = WHITEHEAT_CMD_COMPLETE;
@@ -996,20 +996,20 @@ static void command_port_read_callback(struct urb *urb)
                 wake_up(&command_info->wait_command);
         } else if (data[0] == WHITEHEAT_EVENT) {
                 /* These are unsolicited reports from the firmware, hence no waiting command to wakeup */
-                dbg("%s - event received", __FUNCTION__);
+                dbg("%s - event received", __func__);
         } else if (data[0] == WHITEHEAT_GET_DTR_RTS) {
                 memcpy(command_info->result_buffer, &data[1], urb->actual_length - 1);
                 command_info->command_finished = WHITEHEAT_CMD_COMPLETE;
                 wake_up(&command_info->wait_command);
         } else {
-                dbg("%s - bad reply from firmware", __FUNCTION__);
+                dbg("%s - bad reply from firmware", __func__);
         }
         
         /* Continue trying to always read */
         command_port->read_urb->dev = command_port->serial->dev;
         result = usb_submit_urb(command_port->read_urb, GFP_ATOMIC);
         if (result)
-                dbg("%s - failed resubmitting read urb, error %d", __FUNCTION__, result);
+                dbg("%s - failed resubmitting read urb, error %d", __func__, result);
 }
 
 
@@ -1021,13 +1021,13 @@ static void whiteheat_read_callback(struct urb *urb)
         struct whiteheat_private *info = usb_get_serial_port_data(port);
         int status = urb->status;
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+        dbg("%s - port %d", __func__, port->number);
 
         spin_lock(&info->lock);
         wrap = urb_to_wrap(urb, &info->rx_urbs_submitted);
         if (!wrap) {
                 spin_unlock(&info->lock);
-                err("%s - Not my urb!", __FUNCTION__);
+                err("%s - Not my urb!", __func__);
                 return;
         }
         list_del(&wrap->list);
@@ -1035,14 +1035,14 @@ static void whiteheat_read_callback(struct urb *urb)
 
         if (status) {
                 dbg("%s - nonzero read bulk status received: %d",
-                    __FUNCTION__, status);
+                    __func__, status);
                 spin_lock(&info->lock);
                 list_add(&wrap->list, &info->rx_urbs_free);
                 spin_unlock(&info->lock);
                 return;
         }
 
-        usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data);
+        usb_serial_debug_data(debug, &port->dev, __func__, urb->actual_length, data);
 
         spin_lock(&info->lock);
         list_add_tail(&wrap->list, &info->rx_urb_q);
@@ -1064,13 +1064,13 @@ static void whiteheat_write_callback(struct urb *urb)
         struct whiteheat_urb_wrap *wrap;
         int status = urb->status;
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+        dbg("%s - port %d", __func__, port->number);
 
         spin_lock(&info->lock);
         wrap = urb_to_wrap(urb, &info->tx_urbs_submitted);
         if (!wrap) {
                 spin_unlock(&info->lock);
-                err("%s - Not my urb!", __FUNCTION__);
+                err("%s - Not my urb!", __func__);
                 return;
         }
         list_move(&wrap->list, &info->tx_urbs_free);
@@ -1078,7 +1078,7 @@ static void whiteheat_write_callback(struct urb *urb)
 
         if (status) {
                 dbg("%s - nonzero write bulk status received: %d",
-                    __FUNCTION__, status);
+                    __func__, status);
                 return;
         }
 
@@ -1098,7 +1098,7 @@ static int firm_send_command(struct usb_serial_port *port, __u8 command, __u8 *d
         int retval = 0;
         int t;
 
-        dbg("%s - command %d", __FUNCTION__, command);
+        dbg("%s - command %d", __func__, command);
 
         command_port = port->serial->port[COMMAND_PORT];
         command_info = usb_get_serial_port_data(command_port);
@@ -1112,7 +1112,7 @@ static int firm_send_command(struct usb_serial_port *port, __u8 command, __u8 *d
         command_port->write_urb->dev = port->serial->dev;
         retval = usb_submit_urb (command_port->write_urb, GFP_NOIO);
         if (retval) {
-                dbg("%s - submit urb failed", __FUNCTION__);
+                dbg("%s - submit urb failed", __func__);
                 goto exit;
         }
 
@@ -1123,19 +1123,19 @@ static int firm_send_command(struct usb_serial_port *port, __u8 command, __u8 *d
                 usb_kill_urb(command_port->write_urb);
 
         if (command_info->command_finished == false) {
-                dbg("%s - command timed out.", __FUNCTION__);
+                dbg("%s - command timed out.", __func__);
                 retval = -ETIMEDOUT;
                 goto exit;
         }
 
         if (command_info->command_finished == WHITEHEAT_CMD_FAILURE) {
-                dbg("%s - command failed.", __FUNCTION__);
+                dbg("%s - command failed.", __func__);
                 retval = -EIO;
                 goto exit;
         }
 
         if (command_info->command_finished == WHITEHEAT_CMD_COMPLETE) {
-                dbg("%s - command completed.", __FUNCTION__);
+                dbg("%s - command completed.", __func__);
                 switch (command) {
                         case WHITEHEAT_GET_DTR_RTS:
                                 info = usb_get_serial_port_data(port);
@@ -1180,7 +1180,7 @@ static int firm_setup_port(struct usb_serial_port *port) {
                 default:
                 case CS8:       port_settings.bits = 8;   break;
         }
-        dbg("%s - data bits = %d", __FUNCTION__, port_settings.bits);
+        dbg("%s - data bits = %d", __func__, port_settings.bits);
         
         /* determine the parity */
         if (cflag & PARENB)
@@ -1196,21 +1196,21 @@ static int firm_setup_port(struct usb_serial_port *port) {
                                 port_settings.parity = WHITEHEAT_PAR_EVEN;
         else
                 port_settings.parity = WHITEHEAT_PAR_NONE;
-        dbg("%s - parity = %c", __FUNCTION__, port_settings.parity);
+        dbg("%s - parity = %c", __func__, port_settings.parity);
 
         /* figure out the stop bits requested */
         if (cflag & CSTOPB)
                 port_settings.stop = 2;
         else
                 port_settings.stop = 1;
-        dbg("%s - stop bits = %d", __FUNCTION__, port_settings.stop);
+        dbg("%s - stop bits = %d", __func__, port_settings.stop);
 
         /* figure out the flow control settings */
         if (cflag & CRTSCTS)
                 port_settings.hflow = (WHITEHEAT_HFLOW_CTS | WHITEHEAT_HFLOW_RTS);
         else
                 port_settings.hflow = WHITEHEAT_HFLOW_NONE;
-        dbg("%s - hardware flow control = %s %s %s %s", __FUNCTION__,
+        dbg("%s - hardware flow control = %s %s %s %s", __func__,
             (port_settings.hflow & WHITEHEAT_HFLOW_CTS) ? "CTS" : "",
             (port_settings.hflow & WHITEHEAT_HFLOW_RTS) ? "RTS" : "",
             (port_settings.hflow & WHITEHEAT_HFLOW_DSR) ? "DSR" : "",
@@ -1221,15 +1221,15 @@ static int firm_setup_port(struct usb_serial_port *port) {
                 port_settings.sflow = WHITEHEAT_SFLOW_RXTX;
         else
                 port_settings.sflow = WHITEHEAT_SFLOW_NONE;
-        dbg("%s - software flow control = %c", __FUNCTION__, port_settings.sflow);
+        dbg("%s - software flow control = %c", __func__, port_settings.sflow);
         
         port_settings.xon = START_CHAR(port->tty);
         port_settings.xoff = STOP_CHAR(port->tty);
-        dbg("%s - XON = %2x, XOFF = %2x", __FUNCTION__, port_settings.xon, port_settings.xoff);
+        dbg("%s - XON = %2x, XOFF = %2x", __func__, port_settings.xon, port_settings.xoff);
 
         /* get the baud rate wanted */
         port_settings.baud = tty_get_baud_rate(port->tty);
-        dbg("%s - baud rate = %d", __FUNCTION__, port_settings.baud);
+        dbg("%s - baud rate = %d", __func__, port_settings.baud);
 
         /* fixme: should set validated settings */
         tty_encode_baud_rate(port->tty, port_settings.baud, port_settings.baud);
@@ -1312,7 +1312,7 @@ static int start_command_port(struct usb_serial *serial)
                 command_port->read_urb->dev = serial->dev;
                 retval = usb_submit_urb(command_port->read_urb, GFP_KERNEL);
                 if (retval) {
-                        err("%s - failed submitting read urb, error %d", __FUNCTION__, retval);
+                        err("%s - failed submitting read urb, error %d", __func__, retval);
                         goto exit;
                 }
         }
@@ -1448,7 +1448,7 @@ static void rx_data_softint(struct work_struct *work)
                 urb->dev = port->serial->dev;
                 result = usb_submit_urb(urb, GFP_ATOMIC);
                 if (result) {
-                        err("%s - failed resubmitting read urb, error %d", __FUNCTION__, result);
+                        err("%s - failed resubmitting read urb, error %d", __func__, result);
                         spin_lock_irqsave(&info->lock, flags);
                         list_add(tmp, &info->rx_urbs_free);
                         continue;