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>

6 files changed, 47 insertions, 47 deletions

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 6c4cd82d7d1..de17738f3ac 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1530,60 +1530,60 @@ static int usbdev_ioctl(struct inode *inode, struct file *file,
 
         switch (cmd) {
         case USBDEVFS_CONTROL:
-                snoop(&dev->dev, "%s: CONTROL\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: CONTROL\n", __func__);
                 ret = proc_control(ps, p);
                 if (ret >= 0)
                         inode->i_mtime = CURRENT_TIME;
                 break;
 
         case USBDEVFS_BULK:
-                snoop(&dev->dev, "%s: BULK\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: BULK\n", __func__);
                 ret = proc_bulk(ps, p);
                 if (ret >= 0)
                         inode->i_mtime = CURRENT_TIME;
                 break;
 
         case USBDEVFS_RESETEP:
-                snoop(&dev->dev, "%s: RESETEP\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: RESETEP\n", __func__);
                 ret = proc_resetep(ps, p);
                 if (ret >= 0)
                         inode->i_mtime = CURRENT_TIME;
                 break;
 
         case USBDEVFS_RESET:
-                snoop(&dev->dev, "%s: RESET\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: RESET\n", __func__);
                 ret = proc_resetdevice(ps);
                 break;
 
         case USBDEVFS_CLEAR_HALT:
-                snoop(&dev->dev, "%s: CLEAR_HALT\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: CLEAR_HALT\n", __func__);
                 ret = proc_clearhalt(ps, p);
                 if (ret >= 0)
                         inode->i_mtime = CURRENT_TIME;
                 break;
 
         case USBDEVFS_GETDRIVER:
-                snoop(&dev->dev, "%s: GETDRIVER\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: GETDRIVER\n", __func__);
                 ret = proc_getdriver(ps, p);
                 break;
 
         case USBDEVFS_CONNECTINFO:
-                snoop(&dev->dev, "%s: CONNECTINFO\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: CONNECTINFO\n", __func__);
                 ret = proc_connectinfo(ps, p);
                 break;
 
         case USBDEVFS_SETINTERFACE:
-                snoop(&dev->dev, "%s: SETINTERFACE\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: SETINTERFACE\n", __func__);
                 ret = proc_setintf(ps, p);
                 break;
 
         case USBDEVFS_SETCONFIGURATION:
-                snoop(&dev->dev, "%s: SETCONFIGURATION\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: SETCONFIGURATION\n", __func__);
                 ret = proc_setconfig(ps, p);
                 break;
 
         case USBDEVFS_SUBMITURB:
-                snoop(&dev->dev, "%s: SUBMITURB\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: SUBMITURB\n", __func__);
                 ret = proc_submiturb(ps, p);
                 if (ret >= 0)
                         inode->i_mtime = CURRENT_TIME;
@@ -1592,60 +1592,60 @@ static int usbdev_ioctl(struct inode *inode, struct file *file,
 #ifdef CONFIG_COMPAT
 
         case USBDEVFS_SUBMITURB32:
-                snoop(&dev->dev, "%s: SUBMITURB32\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: SUBMITURB32\n", __func__);
                 ret = proc_submiturb_compat(ps, p);
                 if (ret >= 0)
                         inode->i_mtime = CURRENT_TIME;
                 break;
 
         case USBDEVFS_REAPURB32:
-                snoop(&dev->dev, "%s: REAPURB32\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: REAPURB32\n", __func__);
                 ret = proc_reapurb_compat(ps, p);
                 break;
 
         case USBDEVFS_REAPURBNDELAY32:
-                snoop(&dev->dev, "%s: REAPURBDELAY32\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: REAPURBDELAY32\n", __func__);
                 ret = proc_reapurbnonblock_compat(ps, p);
                 break;
 
         case USBDEVFS_IOCTL32:
-                snoop(&dev->dev, "%s: IOCTL\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: IOCTL\n", __func__);
                 ret = proc_ioctl_compat(ps, ptr_to_compat(p));
                 break;
 #endif
 
         case USBDEVFS_DISCARDURB:
-                snoop(&dev->dev, "%s: DISCARDURB\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: DISCARDURB\n", __func__);
                 ret = proc_unlinkurb(ps, p);
                 break;
 
         case USBDEVFS_REAPURB:
-                snoop(&dev->dev, "%s: REAPURB\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: REAPURB\n", __func__);
                 ret = proc_reapurb(ps, p);
                 break;
 
         case USBDEVFS_REAPURBNDELAY:
-                snoop(&dev->dev, "%s: REAPURBDELAY\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: REAPURBDELAY\n", __func__);
                 ret = proc_reapurbnonblock(ps, p);
                 break;
 
         case USBDEVFS_DISCSIGNAL:
-                snoop(&dev->dev, "%s: DISCSIGNAL\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: DISCSIGNAL\n", __func__);
                 ret = proc_disconnectsignal(ps, p);
                 break;
 
         case USBDEVFS_CLAIMINTERFACE:
-                snoop(&dev->dev, "%s: CLAIMINTERFACE\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: CLAIMINTERFACE\n", __func__);
                 ret = proc_claiminterface(ps, p);
                 break;
 
         case USBDEVFS_RELEASEINTERFACE:
-                snoop(&dev->dev, "%s: RELEASEINTERFACE\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: RELEASEINTERFACE\n", __func__);
                 ret = proc_releaseinterface(ps, p);
                 break;
 
         case USBDEVFS_IOCTL:
-                snoop(&dev->dev, "%s: IOCTL\n", __FUNCTION__);
+                snoop(&dev->dev, "%s: IOCTL\n", __func__);
                 ret = proc_ioctl_default(ps, p);
                 break;
         }
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index edc31e13e95..1e56f1cfa6d 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -157,7 +157,7 @@ static int usb_probe_device(struct device *dev)
         struct usb_device *udev;
         int error = -ENODEV;
 
-        dev_dbg(dev, "%s\n", __FUNCTION__);
+        dev_dbg(dev, "%s\n", __func__);
 
         if (!is_usb_device(dev))        /* Sanity check */
                 return error;
@@ -194,7 +194,7 @@ static int usb_probe_interface(struct device *dev)
         const struct usb_device_id *id;
         int error = -ENODEV;
 
-        dev_dbg(dev, "%s\n", __FUNCTION__);
+        dev_dbg(dev, "%s\n", __func__);
 
         if (is_usb_device(dev))         /* Sanity check */
                 return error;
@@ -211,7 +211,7 @@ static int usb_probe_interface(struct device *dev)
         if (!id)
                 id = usb_match_dynamic_id(intf, driver);
         if (id) {
-                dev_dbg(dev, "%s - got id\n", __FUNCTION__);
+                dev_dbg(dev, "%s - got id\n", __func__);
 
                 error = usb_autoresume_device(udev);
                 if (error)
@@ -793,7 +793,7 @@ static int usb_suspend_device(struct usb_device *udev, pm_message_t msg)
         status = udriver->suspend(udev, msg);
 
  done:
-        dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);
+        dev_vdbg(&udev->dev, "%s: status %d\n", __func__, status);
         return status;
 }
 
@@ -821,7 +821,7 @@ static int usb_resume_device(struct usb_device *udev)
         status = udriver->resume(udev);
 
  done:
-        dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);
+        dev_vdbg(&udev->dev, "%s: status %d\n", __func__, status);
         if (status == 0)
                 udev->autoresume_disabled = 0;
         return status;
@@ -860,7 +860,7 @@ static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg)
         }
 
  done:
-        dev_vdbg(&intf->dev, "%s: status %d\n", __FUNCTION__, status);
+        dev_vdbg(&intf->dev, "%s: status %d\n", __func__, status);
         return status;
 }
 
@@ -910,7 +910,7 @@ static int usb_resume_interface(struct usb_interface *intf, int reset_resume)
         }
 
 done:
-        dev_vdbg(&intf->dev, "%s: status %d\n", __FUNCTION__, status);
+        dev_vdbg(&intf->dev, "%s: status %d\n", __func__, status);
         if (status == 0)
                 mark_active(intf);
 
@@ -1093,7 +1093,7 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg)
         }
 
  done:
-        dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);
+        dev_vdbg(&udev->dev, "%s: status %d\n", __func__, status);
         return status;
 }
 
@@ -1187,7 +1187,7 @@ static int usb_resume_both(struct usb_device *udev)
         }
 
  done:
-        dev_vdbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);
+        dev_vdbg(&udev->dev, "%s: status %d\n", __func__, status);
         if (!status)
                 udev->reset_resume = 0;
         return status;
@@ -1257,7 +1257,7 @@ void usb_autosuspend_device(struct usb_device *udev)
 
         status = usb_autopm_do_device(udev, -1);
         dev_vdbg(&udev->dev, "%s: cnt %d\n",
-                        __FUNCTION__, udev->pm_usage_cnt);
+                        __func__, udev->pm_usage_cnt);
 }
 
 /**
@@ -1277,7 +1277,7 @@ void usb_try_autosuspend_device(struct usb_device *udev)
 {
         usb_autopm_do_device(udev, 0);
         dev_vdbg(&udev->dev, "%s: cnt %d\n",
-                        __FUNCTION__, udev->pm_usage_cnt);
+                        __func__, udev->pm_usage_cnt);
 }
 
 /**
@@ -1305,7 +1305,7 @@ int usb_autoresume_device(struct usb_device *udev)
 
         status = usb_autopm_do_device(udev, 1);
         dev_vdbg(&udev->dev, "%s: status %d cnt %d\n",
-                        __FUNCTION__, status, udev->pm_usage_cnt);
+                        __func__, status, udev->pm_usage_cnt);
         return status;
 }
 
@@ -1377,7 +1377,7 @@ void usb_autopm_put_interface(struct usb_interface *intf)
 
         status = usb_autopm_do_interface(intf, -1);
         dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",
-                        __FUNCTION__, status, intf->pm_usage_cnt);
+                        __func__, status, intf->pm_usage_cnt);
 }
 EXPORT_SYMBOL_GPL(usb_autopm_put_interface);
 
@@ -1421,7 +1421,7 @@ int usb_autopm_get_interface(struct usb_interface *intf)
 
         status = usb_autopm_do_interface(intf, 1);
         dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",
-                        __FUNCTION__, status, intf->pm_usage_cnt);
+                        __func__, status, intf->pm_usage_cnt);
         return status;
 }
 EXPORT_SYMBOL_GPL(usb_autopm_get_interface);
@@ -1443,7 +1443,7 @@ int usb_autopm_set_interface(struct usb_interface *intf)
 
         status = usb_autopm_do_interface(intf, 0);
         dev_vdbg(&intf->dev, "%s: status %d cnt %d\n",
-                        __FUNCTION__, status, intf->pm_usage_cnt);
+                        __func__, status, intf->pm_usage_cnt);
         return status;
 }
 EXPORT_SYMBOL_GPL(usb_autopm_set_interface);
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 5a338a5d4fe..06c3acb161e 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -575,7 +575,7 @@ static int hub_hub_status(struct usb_hub *hub,
         ret = get_hub_status(hub->hdev, &hub->status->hub);
         if (ret < 0)
                 dev_err (hub->intfdev,
-                        "%s failed (err = %d)\n", __FUNCTION__, ret);
+                        "%s failed (err = %d)\n", __func__, ret);
         else {
                 *status = le16_to_cpu(hub->status->hub.wHubStatus);
                 *change = le16_to_cpu(hub->status->hub.wHubChange); 
@@ -1270,7 +1270,7 @@ void usb_disconnect(struct usb_device **pdev)
         int                     i;
 
         if (!udev) {
-                pr_debug ("%s nodev\n", __FUNCTION__);
+                pr_debug ("%s nodev\n", __func__);
                 return;
         }
 
@@ -2072,7 +2072,7 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
                 }
         }
 
-        dev_dbg(&intf->dev, "%s\n", __FUNCTION__);
+        dev_dbg(&intf->dev, "%s\n", __func__);
 
         /* stop khubd and related activity */
         hub_quiesce(hub);
@@ -3125,7 +3125,7 @@ int usb_reset_device(struct usb_device *udev)
 
         if (!parent_hdev) {
                 /* this requires hcd-specific logic; see OHCI hc_restart() */
-                dev_dbg(&udev->dev, "%s for root hub!\n", __FUNCTION__);
+                dev_dbg(&udev->dev, "%s for root hub!\n", __func__);
                 return -EISDIR;
         }
         parent_hub = hdev_to_hub(parent_hdev);
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index 83a373e9cc3..8607846e3c3 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -463,13 +463,13 @@ static int usbfs_fill_super(struct super_block *sb, void *data, int silent)
         inode = usbfs_get_inode(sb, S_IFDIR | 0755, 0);
 
         if (!inode) {
-                dbg("%s: could not get inode!",__FUNCTION__);
+                dbg("%s: could not get inode!",__func__);
                 return -ENOMEM;
         }
 
         root = d_alloc_root(inode);
         if (!root) {
-                dbg("%s: could not get root dentry!",__FUNCTION__);
+                dbg("%s: could not get root dentry!",__func__);
                 iput(inode);
                 return -ENOMEM;
         }
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 5b23f6b017d..e819e5359d5 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -312,7 +312,7 @@ static void sg_complete(struct urb *urb)
                                     retval != -EBUSY)
                                         dev_err(&io->dev->dev,
                                                 "%s, unlink --> %d\n",
-                                                __FUNCTION__, retval);
+                                                __func__, retval);
                         } else if (urb == io->urbs [i])
                                 found = 1;
                 }
@@ -550,7 +550,7 @@ void usb_sg_wait(struct usb_sg_request *io)
                         io->urbs[i]->dev = NULL;
                         io->urbs[i]->status = retval;
                         dev_dbg(&io->dev->dev, "%s, submit --> %d\n",
-                                __FUNCTION__, retval);
+                                __func__, retval);
                         usb_sg_cancel(io);
                 }
                 spin_lock_irq(&io->lock);
@@ -600,7 +600,7 @@ void usb_sg_cancel(struct usb_sg_request *io)
                         retval = usb_unlink_urb(io->urbs [i]);
                         if (retval != -EINPROGRESS && retval != -EBUSY)
                                 dev_warn(&io->dev->dev, "%s, unlink --> %d\n",
-                                        __FUNCTION__, retval);
+                                        __func__, retval);
                 }
                 spin_lock(&io->lock);
         }
@@ -1068,7 +1068,7 @@ void usb_disable_device(struct usb_device *dev, int skip_ep0)
 {
         int i;
 
-        dev_dbg(&dev->dev, "%s nuking %s URBs\n", __FUNCTION__,
+        dev_dbg(&dev->dev, "%s nuking %s URBs\n", __func__,
                 skip_ep0 ? "non-ep0" : "all");
         for (i = skip_ep0; i < 16; ++i) {
                 usb_disable_endpoint(dev, i);
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index 1d3ed1322fb..c0b1ae25ae2 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -334,7 +334,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
                 dev_dbg(&dev->dev,
                         "bogus endpoint ep%d%s in %s (bad maxpacket %d)\n",
                         usb_endpoint_num(&ep->desc), is_out ? "out" : "in",
-                        __FUNCTION__, max);
+                        __func__, max);
                 return -EMSGSIZE;
         }