1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 039847795185..6ce292ef1c47 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -208,7 +208,7 @@ static void keyspan_pda_request_unthrottle(struct work_struct *work)
                                  2000);
         if (result < 0)
                 dbg("%s - error %d from usb_control_msg", 
-                    __FUNCTION__, result);
+                    __func__, result);
 }
 
 
@@ -232,11 +232,11 @@ static void keyspan_pda_rx_interrupt (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);
                 goto exit;
         }
 
@@ -274,7 +274,7 @@ exit:
         retval = usb_submit_urb (urb, GFP_ATOMIC);
         if (retval)
                 err ("%s - usb_submit_urb failed with result %d",
-                     __FUNCTION__, retval);
+                     __func__, retval);
 }
 
 
@@ -358,7 +358,7 @@ static void keyspan_pda_break_ctl (struct usb_serial_port *port, int break_state
                                 value, 0, NULL, 0, 2000);
         if (result < 0)
                 dbg("%s - error %d from usb_control_msg", 
-                    __FUNCTION__, result);
+                    __func__, result);
         /* there is something funky about this.. the TCSBRK that 'cu' performs
            ought to translate into a break_ctl(-1),break_ctl(0) pair HZ/4
            seconds apart, but it feels like the break sent isn't as long as it
@@ -665,11 +665,11 @@ static int keyspan_pda_open (struct usb_serial_port *port, struct file *filp)
                              1,
                              2000);
         if (rc < 0) {
-                dbg("%s - roomquery failed", __FUNCTION__);
+                dbg("%s - roomquery failed", __func__);
                 goto error;
         }
         if (rc == 0) {
-                dbg("%s - roomquery returned 0 bytes", __FUNCTION__);
+                dbg("%s - roomquery returned 0 bytes", __func__);
                 rc = -EIO;
                 goto error;
         }
@@ -688,7 +688,7 @@ static int keyspan_pda_open (struct usb_serial_port *port, struct file *filp)
         port->interrupt_in_urb->dev = serial->dev;
         rc = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL);
         if (rc) {
-                dbg("%s - usb_submit_urb(read int) failed", __FUNCTION__);
+                dbg("%s - usb_submit_urb(read int) failed", __func__);
                 goto error;
         }
 
@@ -732,7 +732,7 @@ static int keyspan_pda_fake_startup (struct usb_serial *serial)
                 record = &xircom_pgs_firmware[0];
 #endif
         if (record == NULL) {
-                err("%s: unknown vendor, aborting.", __FUNCTION__);
+                err("%s: unknown vendor, aborting.", __func__);
                 return -ENODEV;
         }
 
@@ -779,7 +779,7 @@ static int keyspan_pda_startup (struct usb_serial *serial)
 
 static void keyspan_pda_shutdown (struct usb_serial *serial)
 {
-        dbg("%s", __FUNCTION__);
+        dbg("%s", __func__);
         
         kfree(usb_get_serial_port_data(serial->port[0]));
 }