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, 78 insertions, 78 deletions

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 54b502f2924c..8b531b377dcb 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -525,7 +525,7 @@ static int update_mctrl(struct usb_serial_port *port, unsigned int set, unsigned
         int rv;
 
         if (((set | clear) & (TIOCM_DTR | TIOCM_RTS)) == 0) {
-                dbg("%s - DTR|RTS not being set|cleared", __FUNCTION__);
+                dbg("%s - DTR|RTS not being set|cleared", __func__);
                 return 0;       /* no change */
         }
 
@@ -553,13 +553,13 @@ static int update_mctrl(struct usb_serial_port *port, unsigned int set, unsigned
         kfree(buf);
         if (rv < 0) {
                 err("%s Error from MODEM_CTRL urb: DTR %s, RTS %s",
-                                __FUNCTION__,
+                                __func__,
                                 (set & TIOCM_DTR) ? "HIGH" :
                                 (clear & TIOCM_DTR) ? "LOW" : "unchanged",
                                 (set & TIOCM_RTS) ? "HIGH" :
                                 (clear & TIOCM_RTS) ? "LOW" : "unchanged");
         } else {
-                dbg("%s - DTR %s, RTS %s", __FUNCTION__,
+                dbg("%s - DTR %s, RTS %s", __func__,
                                 (set & TIOCM_DTR) ? "HIGH" :
                                 (clear & TIOCM_DTR) ? "LOW" : "unchanged",
                                 (set & TIOCM_RTS) ? "HIGH" :
@@ -639,7 +639,7 @@ static __u32 get_ftdi_divisor(struct usb_serial_port * port)
         /* 1. Get the baud rate from the tty settings, this observes alt_speed hack */
 
         baud = tty_get_baud_rate(port->tty);
-        dbg("%s - tty_get_baud_rate reports speed %d", __FUNCTION__, baud);
+        dbg("%s - tty_get_baud_rate reports speed %d", __func__, baud);
 
         /* 2. Observe async-compatible custom_divisor hack, update baudrate if needed */
 
@@ -647,7 +647,7 @@ static __u32 get_ftdi_divisor(struct usb_serial_port * port)
             ((priv->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST) &&
              (priv->custom_divisor)) {
                 baud = priv->baud_base / priv->custom_divisor;
-                dbg("%s - custom divisor %d sets baud rate to %d", __FUNCTION__, priv->custom_divisor, baud);
+                dbg("%s - custom divisor %d sets baud rate to %d", __func__, priv->custom_divisor, baud);
         }
 
         /* 3. Convert baudrate to device-specific divisor */
@@ -668,7 +668,7 @@ static __u32 get_ftdi_divisor(struct usb_serial_port * port)
                 case 115200: div_value = ftdi_sio_b115200; break;
                 } /* baud */
                 if (div_value == 0) {
-                        dbg("%s - Baudrate (%d) requested is not supported", __FUNCTION__,  baud);
+                        dbg("%s - Baudrate (%d) requested is not supported", __func__,  baud);
                         div_value = ftdi_sio_b9600;
                         baud = 9600;
                         div_okay = 0;
@@ -678,7 +678,7 @@ static __u32 get_ftdi_divisor(struct usb_serial_port * port)
                 if (baud <= 3000000) {
                         div_value = ftdi_232am_baud_to_divisor(baud);
                 } else {
-                        dbg("%s - Baud rate too high!", __FUNCTION__);
+                        dbg("%s - Baud rate too high!", __func__);
                         baud = 9600;
                         div_value = ftdi_232am_baud_to_divisor(9600);
                         div_okay = 0;
@@ -690,7 +690,7 @@ static __u32 get_ftdi_divisor(struct usb_serial_port * port)
                 if (baud <= 3000000) {
                         div_value = ftdi_232bm_baud_to_divisor(baud);
                 } else {
-                        dbg("%s - Baud rate too high!", __FUNCTION__);
+                        dbg("%s - Baud rate too high!", __func__);
                         div_value = ftdi_232bm_baud_to_divisor(9600);
                         div_okay = 0;
                         baud = 9600;
@@ -700,7 +700,7 @@ static __u32 get_ftdi_divisor(struct usb_serial_port * port)
 
         if (div_okay) {
                 dbg("%s - Baud rate set to %d (divisor 0x%lX) on chip %s",
-                        __FUNCTION__, baud, (unsigned long)div_value,
+                        __func__, baud, (unsigned long)div_value,
                         ftdi_chip_name[priv->chip_type]);
         }
 
@@ -801,7 +801,7 @@ static void ftdi_determine_type(struct usb_serial_port *port)
 
         version = le16_to_cpu(udev->descriptor.bcdDevice);
         interfaces = udev->actconfig->desc.bNumInterfaces;
-        dbg("%s: bcdDevice = 0x%x, bNumInterfaces = %u", __FUNCTION__,
+        dbg("%s: bcdDevice = 0x%x, bNumInterfaces = %u", __func__,
                         version, interfaces);
         if (interfaces > 1) {
                 int inter;
@@ -819,7 +819,7 @@ static void ftdi_determine_type(struct usb_serial_port *port)
                  * to 0x200 when iSerialNumber is 0.  */
                 if (version < 0x500) {
                         dbg("%s: something fishy - bcdDevice too low for multi-interface device",
-                                        __FUNCTION__);
+                                        __func__);
                 }
         } else if (version < 0x200) {
                 /* Old device.  Assume its the original SIO. */
@@ -857,7 +857,7 @@ static ssize_t show_latency_timer(struct device *dev, struct device_attribute *a
         int rv = 0;
 
 
-        dbg("%s",__FUNCTION__);
+        dbg("%s",__func__);
 
         rv = usb_control_msg(udev,
                              usb_rcvctrlpipe(udev, 0),
@@ -884,7 +884,7 @@ static ssize_t store_latency_timer(struct device *dev, struct device_attribute *
         int v = simple_strtoul(valbuf, NULL, 10);
         int rv = 0;
 
-        dbg("%s: setting latency timer = %i", __FUNCTION__, v);
+        dbg("%s: setting latency timer = %i", __func__, v);
 
         rv = usb_control_msg(udev,
                              usb_sndctrlpipe(udev, 0),
@@ -913,7 +913,7 @@ static ssize_t store_event_char(struct device *dev, struct device_attribute *att
         int v = simple_strtoul(valbuf, NULL, 10);
         int rv = 0;
 
-        dbg("%s: setting event char = %i", __FUNCTION__, v);
+        dbg("%s: setting event char = %i", __func__, v);
 
         rv = usb_control_msg(udev,
                              usb_sndctrlpipe(udev, 0),
@@ -938,7 +938,7 @@ static int create_sysfs_attrs(struct usb_serial_port *port)
         struct ftdi_private *priv = usb_get_serial_port_data(port);
         int retval = 0;
 
-        dbg("%s",__FUNCTION__);
+        dbg("%s",__func__);
 
         /* XXX I've no idea if the original SIO supports the event_char
          * sysfs parameter, so I'm playing it safe.  */
@@ -960,7 +960,7 @@ static void remove_sysfs_attrs(struct usb_serial_port *port)
 {
         struct ftdi_private *priv = usb_get_serial_port_data(port);
 
-        dbg("%s",__FUNCTION__);
+        dbg("%s",__func__);
 
         /* XXX see create_sysfs_attrs */
         if (priv->chip_type != SIO) {
@@ -1002,11 +1002,11 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port)
         struct ftdi_sio_quirk *quirk = usb_get_serial_data(port->serial);
 
 
-        dbg("%s",__FUNCTION__);
+        dbg("%s",__func__);
 
         priv = kzalloc(sizeof(struct ftdi_private), GFP_KERNEL);
         if (!priv){
-                err("%s- kmalloc(%Zd) failed.", __FUNCTION__, sizeof(struct ftdi_private));
+                err("%s- kmalloc(%Zd) failed.", __func__, sizeof(struct ftdi_private));
                 return -ENOMEM;
         }
 
@@ -1055,7 +1055,7 @@ static int ftdi_sio_port_probe(struct usb_serial_port *port)
 /* Called from usbserial:serial_probe */
 static void ftdi_USB_UIRT_setup (struct ftdi_private *priv)
 {
-        dbg("%s",__FUNCTION__);
+        dbg("%s",__func__);
 
         priv->flags |= ASYNC_SPD_CUST;
         priv->custom_divisor = 77;
@@ -1066,7 +1066,7 @@ static void ftdi_USB_UIRT_setup (struct ftdi_private *priv)
  * baudrate (38400 gets mapped to 100000) and RTS-CTS enabled.  */
 static void ftdi_HE_TIRA1_setup (struct ftdi_private *priv)
 {
-        dbg("%s",__FUNCTION__);
+        dbg("%s",__func__);
 
         priv->flags |= ASYNC_SPD_CUST;
         priv->custom_divisor = 240;
@@ -1084,7 +1084,7 @@ static int ftdi_jtag_probe(struct usb_serial *serial)
         struct usb_device *udev = serial->dev;
         struct usb_interface *interface = serial->interface;
 
-        dbg("%s",__FUNCTION__);
+        dbg("%s",__func__);
 
         if (interface == udev->actconfig->interface[0]) {
                 info("Ignoring serial port reserved for JTAG");
@@ -1120,14 +1120,14 @@ static int ftdi_mtxorb_hack_setup(struct usb_serial *serial)
  */
 static void ftdi_shutdown (struct usb_serial *serial)
 {
-        dbg("%s", __FUNCTION__);
+        dbg("%s", __func__);
 }
 
 static int ftdi_sio_port_remove(struct usb_serial_port *port)
 {
         struct ftdi_private *priv = usb_get_serial_port_data(port);
 
-        dbg("%s", __FUNCTION__);
+        dbg("%s", __func__);
 
         remove_sysfs_attrs(port);
 
@@ -1152,7 +1152,7 @@ static int  ftdi_open (struct usb_serial_port *port, struct file *filp)
         int result = 0;
         char buf[1]; /* Needed for the usb_control_msg I think */
 
-        dbg("%s", __FUNCTION__);
+        dbg("%s", __func__);
 
         spin_lock_irqsave(&priv->tx_lock, flags);
         priv->tx_bytes = 0;
@@ -1197,7 +1197,7 @@ static int  ftdi_open (struct usb_serial_port *port, struct file *filp)
                       ftdi_read_bulk_callback, port);
         result = usb_submit_urb(port->read_urb, GFP_KERNEL);
         if (result)
-                err("%s - failed submitting read urb, error %d", __FUNCTION__, result);
+                err("%s - failed submitting read urb, error %d", __func__, result);
 
 
         return result;
@@ -1219,7 +1219,7 @@ static void ftdi_close (struct usb_serial_port *port, struct file *filp)
         struct ftdi_private *priv = usb_get_serial_port_data(port);
         char buf[1];
 
-        dbg("%s", __FUNCTION__);
+        dbg("%s", __func__);
 
         mutex_lock(&port->serial->disc_mutex);
         if (c_cflag & HUPCL && !port->serial->disconnected){
@@ -1266,7 +1266,7 @@ static int ftdi_write (struct usb_serial_port *port,
         int transfer_size;
         unsigned long flags;
 
-        dbg("%s port %d, %d bytes", __FUNCTION__, port->number, count);
+        dbg("%s port %d, %d bytes", __func__, port->number, count);
 
         if (count == 0) {
                 dbg("write request of 0 bytes");
@@ -1275,7 +1275,7 @@ static int ftdi_write (struct usb_serial_port *port,
         spin_lock_irqsave(&priv->tx_lock, flags);
         if (priv->tx_outstanding_urbs > URB_UPPER_LIMIT) {
                 spin_unlock_irqrestore(&priv->tx_lock, flags);
-                dbg("%s - write limit hit\n", __FUNCTION__);
+                dbg("%s - write limit hit\n", __func__);
                 return 0;
         }
         priv->tx_outstanding_urbs++;
@@ -1295,14 +1295,14 @@ static int ftdi_write (struct usb_serial_port *port,
 
         buffer = kmalloc (transfer_size, GFP_ATOMIC);
         if (!buffer) {
-                err("%s ran out of kernel memory for urb ...", __FUNCTION__);
+                err("%s ran out of kernel memory for urb ...", __func__);
                 count = -ENOMEM;
                 goto error_no_buffer;
         }
 
         urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!urb) {
-                err("%s - no more free urbs", __FUNCTION__);
+                err("%s - no more free urbs", __func__);
                 count = -ENOMEM;
                 goto error_no_urb;
         }
@@ -1334,7 +1334,7 @@ static int ftdi_write (struct usb_serial_port *port,
                 memcpy (buffer, buf, count);
         }
 
-        usb_serial_debug_data(debug, &port->dev, __FUNCTION__, transfer_size, buffer);
+        usb_serial_debug_data(debug, &port->dev, __func__, transfer_size, buffer);
 
         /* fill the buffer and send it */
         usb_fill_bulk_urb(urb, port->serial->dev,
@@ -1344,7 +1344,7 @@ static int ftdi_write (struct usb_serial_port *port,
 
         status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status) {
-                err("%s - failed submitting write urb, error %d", __FUNCTION__, status);
+                err("%s - failed submitting write urb, error %d", __func__, status);
                 count = status;
                 goto error;
         } else {
@@ -1358,7 +1358,7 @@ static int ftdi_write (struct usb_serial_port *port,
          * really free it when it is finished with it */
         usb_free_urb(urb);
 
-        dbg("%s write returning: %d", __FUNCTION__, count);
+        dbg("%s write returning: %d", __func__, count);
         return count;
 error:
         usb_free_urb(urb);
@@ -1386,7 +1386,7 @@ static void ftdi_write_bulk_callback (struct urb *urb)
         /* free up the transfer buffer, as usb_free_urb() does not do this */
         kfree (urb->transfer_buffer);
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+        dbg("%s - port %d", __func__, port->number);
 
         if (status) {
                 dbg("nonzero write bulk status received: %d", status);
@@ -1395,7 +1395,7 @@ static void ftdi_write_bulk_callback (struct urb *urb)
 
         priv = usb_get_serial_port_data(port);
         if (!priv) {
-                dbg("%s - bad port private data pointer - exiting", __FUNCTION__);
+                dbg("%s - bad port private data pointer - exiting", __func__);
                 return;
         }
         /* account for transferred data */
@@ -1420,7 +1420,7 @@ static int ftdi_write_room( struct usb_serial_port *port )
         int room;
         unsigned long flags;
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+        dbg("%s - port %d", __func__, port->number);
 
         spin_lock_irqsave(&priv->tx_lock, flags);
         if (priv->tx_outstanding_urbs < URB_UPPER_LIMIT) {
@@ -1444,13 +1444,13 @@ static int ftdi_chars_in_buffer (struct usb_serial_port *port)
         int buffered;
         unsigned long flags;
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+        dbg("%s - port %d", __func__, port->number);
 
         spin_lock_irqsave(&priv->tx_lock, flags);
         buffered = (int)priv->tx_outstanding_bytes;
         spin_unlock_irqrestore(&priv->tx_lock, flags);
         if (buffered < 0) {
-                err("%s outstanding tx bytes is negative!", __FUNCTION__);
+                err("%s outstanding tx bytes is negative!", __func__);
                 buffered = 0;
         }
         return buffered;
@@ -1468,30 +1468,30 @@ static void ftdi_read_bulk_callback (struct urb *urb)
         int status = urb->status;
 
         if (urb->number_of_packets > 0) {
-                err("%s transfer_buffer_length %d actual_length %d number of packets %d",__FUNCTION__,
+                err("%s transfer_buffer_length %d actual_length %d number of packets %d",__func__,
                     urb->transfer_buffer_length, urb->actual_length, urb->number_of_packets );
-                err("%s transfer_flags %x ", __FUNCTION__,urb->transfer_flags );
+                err("%s transfer_flags %x ", __func__,urb->transfer_flags );
         }
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+        dbg("%s - port %d", __func__, port->number);
 
         if (port->open_count <= 0)
                 return;
 
         tty = port->tty;
         if (!tty) {
-                dbg("%s - bad tty pointer - exiting",__FUNCTION__);
+                dbg("%s - bad tty pointer - exiting",__func__);
                 return;
         }
 
         priv = usb_get_serial_port_data(port);
         if (!priv) {
-                dbg("%s - bad port private data pointer - exiting", __FUNCTION__);
+                dbg("%s - bad port private data pointer - exiting", __func__);
                 return;
         }
 
         if (urb != port->read_urb) {
-                err("%s - Not my urb!", __FUNCTION__);
+                err("%s - Not my urb!", __func__);
         }
 
         if (status) {
@@ -1529,39 +1529,39 @@ static void ftdi_process_read (struct work_struct *work)
         int packet_offset;
         unsigned long flags;
 
-        dbg("%s - port %d", __FUNCTION__, port->number);
+        dbg("%s - port %d", __func__, port->number);
 
         if (port->open_count <= 0)
                 return;
 
         tty = port->tty;
         if (!tty) {
-                dbg("%s - bad tty pointer - exiting",__FUNCTION__);
+                dbg("%s - bad tty pointer - exiting",__func__);
                 return;
         }
 
         priv = usb_get_serial_port_data(port);
         if (!priv) {
-                dbg("%s - bad port private data pointer - exiting", __FUNCTION__);
+                dbg("%s - bad port private data pointer - exiting", __func__);
                 return;
         }
 
         urb = port->read_urb;
         if (!urb) {
-                dbg("%s - bad read_urb pointer - exiting", __FUNCTION__);
+                dbg("%s - bad read_urb pointer - exiting", __func__);
                 return;
         }
 
         data = urb->transfer_buffer;
 
         if (priv->rx_processed) {
-                dbg("%s - already processed: %d bytes, %d remain", __FUNCTION__,
+                dbg("%s - already processed: %d bytes, %d remain", __func__,
                                 priv->rx_processed,
                                 urb->actual_length - priv->rx_processed);
         } else {
                 /* The first two bytes of every read packet are status */
                 if (urb->actual_length > 2) {
-                        usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data);
+                        usb_serial_debug_data(debug, &port->dev, __func__, urb->actual_length, data);
                 } else {
                         dbg("Status only: %03oo %03oo",data[0],data[1]);
                 }
@@ -1591,17 +1591,17 @@ static void ftdi_process_read (struct work_struct *work)
 
                 length = min(PKTSZ, urb->actual_length-packet_offset)-2;
                 if (length < 0) {
-                        err("%s - bad packet length: %d", __FUNCTION__, length+2);
+                        err("%s - bad packet length: %d", __func__, length+2);
                         length = 0;
                 }
 
                 if (priv->rx_flags & THROTTLED) {
-                        dbg("%s - throttled", __FUNCTION__);
+                        dbg("%s - throttled", __func__);
                         break;
                 }
                 if (tty_buffer_request_room(tty, length) < length) {
                         /* break out & wait for throttling/unthrottling to happen */
-                        dbg("%s - receive room low", __FUNCTION__);
+                        dbg("%s - receive room low", __func__);
                         break;
                 }
 
@@ -1669,7 +1669,7 @@ static void ftdi_process_read (struct work_struct *work)
                 /* not completely processed - record progress */
                 priv->rx_processed = packet_offset;
                 dbg("%s - incomplete, %d bytes processed, %d remain",
-                                __FUNCTION__, packet_offset,
+                                __func__, packet_offset,
                                 urb->actual_length - packet_offset);
                 /* check if we were throttled while processing */
                 spin_lock_irqsave(&priv->rx_lock, flags);
@@ -1677,7 +1677,7 @@ static void ftdi_process_read (struct work_struct *work)
                         priv->rx_flags |= ACTUALLY_THROTTLED;
                         spin_unlock_irqrestore(&priv->rx_lock, flags);
                         dbg("%s - deferring remainder until unthrottled",
-                                        __FUNCTION__);
+                                        __func__);
                         return;
                 }
                 spin_unlock_irqrestore(&priv->rx_lock, flags);
@@ -1686,7 +1686,7 @@ static void ftdi_process_read (struct work_struct *work)
                         /* delay processing of remainder */
                         schedule_delayed_work(&priv->rx_work, 1);
                 } else {
-                        dbg("%s - port is closed", __FUNCTION__);
+                        dbg("%s - port is closed", __func__);
                 }
                 return;
         }
@@ -1704,7 +1704,7 @@ static void ftdi_process_read (struct work_struct *work)
 
                 result = usb_submit_urb(port->read_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);
         }
 
         return;
@@ -1733,10 +1733,10 @@ static void ftdi_break_ctl( struct usb_serial_port *port, int break_state )
                             FTDI_SIO_SET_DATA_REQUEST_TYPE,
                             urb_value , priv->interface,
                             buf, 0, WDR_TIMEOUT) < 0) {
-                err("%s FAILED to enable/disable break state (state was %d)", __FUNCTION__,break_state);
+                err("%s FAILED to enable/disable break state (state was %d)", __func__,break_state);
         }
 
-        dbg("%s break state is %d - urb is %d", __FUNCTION__,break_state, urb_value);
+        dbg("%s break state is %d - urb is %d", __func__,break_state, urb_value);
 
 }
 
@@ -1760,18 +1760,18 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct ktermios *old
         unsigned char vstop;
         unsigned char vstart;
 
-        dbg("%s", __FUNCTION__);
+        dbg("%s", __func__);
 
         /* Force baud rate if this device requires it, unless it is set to B0. */
         if (priv->force_baud && ((termios->c_cflag & CBAUD) != B0)) {
-                dbg("%s: forcing baud rate for this device", __FUNCTION__);
+                dbg("%s: forcing baud rate for this device", __func__);
                 tty_encode_baud_rate(port->tty, priv->force_baud,
                                         priv->force_baud);
         }
 
         /* Force RTS-CTS if this device requires it. */
         if (priv->force_rtscts) {
-                dbg("%s: forcing rtscts for this device", __FUNCTION__);
+                dbg("%s: forcing rtscts for this device", __func__);
                 termios->c_cflag |= CRTSCTS;
         }
 
@@ -1815,7 +1815,7 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct ktermios *old
                             FTDI_SIO_SET_DATA_REQUEST_TYPE,
                             urb_value , priv->interface,
                             buf, 0, WDR_SHORT_TIMEOUT) < 0) {
-                err("%s FAILED to set databits/stopbits/parity", __FUNCTION__);
+                err("%s FAILED to set databits/stopbits/parity", __func__);
         }
 
         /* Now do the baudrate */
@@ -1826,14 +1826,14 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct ktermios *old
                                     FTDI_SIO_SET_FLOW_CTRL_REQUEST_TYPE,
                                     0, priv->interface,
                                     buf, 0, WDR_TIMEOUT) < 0) {
-                        err("%s error from disable flowcontrol urb", __FUNCTION__);
+                        err("%s error from disable flowcontrol urb", __func__);
                 }
                 /* Drop RTS and DTR */
                 clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
         } else {
                 /* set the baudrate determined before */
                 if (change_speed(port)) {
-                        err("%s urb failed to set baudrate", __FUNCTION__);
+                        err("%s urb failed to set baudrate", __func__);
                 }
                 /* Ensure RTS and DTR are raised when baudrate changed from 0 */
                 if (!old_termios || (old_termios->c_cflag & CBAUD) == B0) {
@@ -1844,7 +1844,7 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct ktermios *old
         /* Set flow control */
         /* Note device also supports DTR/CD (ugh) and Xon/Xoff in hardware */
         if (cflag & CRTSCTS) {
-                dbg("%s Setting to CRTSCTS flow control", __FUNCTION__);
+                dbg("%s Setting to CRTSCTS flow control", __func__);
                 if (usb_control_msg(dev,
                                     usb_sndctrlpipe(dev, 0),
                                     FTDI_SIO_SET_FLOW_CTRL_REQUEST,
@@ -1862,7 +1862,7 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct ktermios *old
                  * if IXOFF is not set, the pre-xon/xoff code is executed.
                 */
                 if (iflag & IXOFF) {
-                        dbg("%s  request to enable xonxoff iflag=%04x",__FUNCTION__,iflag);
+                        dbg("%s  request to enable xonxoff iflag=%04x",__func__,iflag);
                         // Try to enable the XON/XOFF on the ftdi_sio
                         // Set the vstart and vstop -- could have been done up above where
                         // a lot of other dereferencing is done but that would be very
@@ -1883,7 +1883,7 @@ static void ftdi_set_termios (struct usb_serial_port *port, struct ktermios *old
                 } else {
                         /* else clause to only run if cfag ! CRTSCTS and iflag ! XOFF */
                         /* CHECKME Assuming XON/XOFF handled by tty stack - not by device */
-                        dbg("%s Turning off hardware flow control", __FUNCTION__);
+                        dbg("%s Turning off hardware flow control", __func__);
                         if (usb_control_msg(dev,
                                             usb_sndctrlpipe(dev, 0),
                                             FTDI_SIO_SET_FLOW_CTRL_REQUEST,
@@ -1905,7 +1905,7 @@ static int ftdi_tiocmget (struct usb_serial_port *port, struct file *file)
         unsigned char buf[2];
         int ret;
 
-        dbg("%s TIOCMGET", __FUNCTION__);
+        dbg("%s TIOCMGET", __func__);
         switch (priv->chip_type) {
         case SIO:
                 /* Request the status from the device */
@@ -1915,7 +1915,7 @@ static int ftdi_tiocmget (struct usb_serial_port *port, struct file *file)
                                            FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE,
                                            0, 0,
                                            buf, 1, WDR_TIMEOUT)) < 0 ) {
-                        err("%s Could not get modem status of device - err: %d", __FUNCTION__,
+                        err("%s Could not get modem status of device - err: %d", __func__,
                             ret);
                         return(ret);
                 }
@@ -1932,7 +1932,7 @@ static int ftdi_tiocmget (struct usb_serial_port *port, struct file *file)
                                            FTDI_SIO_GET_MODEM_STATUS_REQUEST_TYPE,
                                            0, priv->interface,
                                            buf, 2, WDR_TIMEOUT)) < 0 ) {
-                        err("%s Could not get modem status of device - err: %d", __FUNCTION__,
+                        err("%s Could not get modem status of device - err: %d", __func__,
                             ret);
                         return(ret);
                 }
@@ -1951,7 +1951,7 @@ static int ftdi_tiocmget (struct usb_serial_port *port, struct file *file)
 
 static int ftdi_tiocmset(struct usb_serial_port *port, struct file * file, unsigned int set, unsigned int clear)
 {
-        dbg("%s TIOCMSET", __FUNCTION__);
+        dbg("%s TIOCMSET", __func__);
         return update_mctrl(port, set, clear);
 }
 
@@ -1960,7 +1960,7 @@ static int ftdi_ioctl (struct usb_serial_port *port, struct file * file, unsigne
 {
         struct ftdi_private *priv = usb_get_serial_port_data(port);
 
-        dbg("%s cmd 0x%04x", __FUNCTION__, cmd);
+        dbg("%s cmd 0x%04x", __func__, cmd);
 
         /* Based on code from acm.c and others */
         switch (cmd) {
@@ -2019,7 +2019,7 @@ static int ftdi_ioctl (struct usb_serial_port *port, struct file * file, unsigne
         /* This is not necessarily an error - turns out the higher layers will do
          *  some ioctls itself (see comment above)
          */
-        dbg("%s arg not supported - it was 0x%04x - check /usr/include/asm/ioctls.h", __FUNCTION__, cmd);
+        dbg("%s arg not supported - it was 0x%04x - check /usr/include/asm/ioctls.h", __func__, cmd);
 
         return(-ENOIOCTLCMD);
 } /* ftdi_ioctl */
@@ -2030,7 +2030,7 @@ static void ftdi_throttle (struct usb_serial_port *port)
         struct ftdi_private *priv = 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(&priv->rx_lock, flags);
         priv->rx_flags |= THROTTLED;
@@ -2044,7 +2044,7 @@ static void ftdi_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(&priv->rx_lock, flags);
         actually_throttled = priv->rx_flags & ACTUALLY_THROTTLED;
@@ -2059,7 +2059,7 @@ static int __init ftdi_init (void)
 {
         int retval;
 
-        dbg("%s", __FUNCTION__);
+        dbg("%s", __func__);
         if (vendor > 0 && product > 0) {
                 /* Add user specified VID/PID to reserved element of table. */
                 int i;
@@ -2088,7 +2088,7 @@ failed_sio_register:
 static void __exit ftdi_exit (void)
 {
 
-        dbg("%s", __FUNCTION__);
+        dbg("%s", __func__);
 
         usb_deregister (&ftdi_driver);
         usb_serial_deregister (&ftdi_sio_device);