1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index f59593de3b8f..a856effad3bd 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -190,7 +190,7 @@ static int storage_suspend(struct usb_interface *iface, pm_message_t message)
         /* Wait until no command is running */
         mutex_lock(&us->dev_mutex);
 
-        US_DEBUGP("%s\n", __FUNCTION__);
+        US_DEBUGP("%s\n", __func__);
         if (us->suspend_resume_hook)
                 (us->suspend_resume_hook)(us, US_SUSPEND);
 
@@ -207,7 +207,7 @@ static int storage_resume(struct usb_interface *iface)
 
         mutex_lock(&us->dev_mutex);
 
-        US_DEBUGP("%s\n", __FUNCTION__);
+        US_DEBUGP("%s\n", __func__);
         if (us->suspend_resume_hook)
                 (us->suspend_resume_hook)(us, US_RESUME);
 
@@ -219,7 +219,7 @@ static int storage_reset_resume(struct usb_interface *iface)
 {
         struct us_data *us = usb_get_intfdata(iface);
 
-        US_DEBUGP("%s\n", __FUNCTION__);
+        US_DEBUGP("%s\n", __func__);
 
         /* Report the reset to the SCSI core */
         usb_stor_report_bus_reset(us);
@@ -240,7 +240,7 @@ static int storage_pre_reset(struct usb_interface *iface)
 {
         struct us_data *us = usb_get_intfdata(iface);
 
-        US_DEBUGP("%s\n", __FUNCTION__);
+        US_DEBUGP("%s\n", __func__);
 
         /* Make sure no command runs during the reset */
         mutex_lock(&us->dev_mutex);
@@ -251,7 +251,7 @@ static int storage_post_reset(struct usb_interface *iface)
 {
         struct us_data *us = usb_get_intfdata(iface);
 
-        US_DEBUGP("%s\n", __FUNCTION__);
+        US_DEBUGP("%s\n", __func__);
 
         /* Report the reset to the SCSI core */
         usb_stor_report_bus_reset(us);
@@ -437,7 +437,7 @@ SkipForAbort:
 /* Associate our private data with the USB device */
 static int associate_dev(struct us_data *us, struct usb_interface *intf)
 {
-        US_DEBUGP("-- %s\n", __FUNCTION__);
+        US_DEBUGP("-- %s\n", __func__);
 
         /* Fill in the device-related fields */
         us->pusb_dev = interface_to_usbdev(intf);
@@ -816,7 +816,7 @@ static int usb_stor_acquire_resources(struct us_data *us)
 /* Release all our dynamic resources */
 static void usb_stor_release_resources(struct us_data *us)
 {
-        US_DEBUGP("-- %s\n", __FUNCTION__);
+        US_DEBUGP("-- %s\n", __func__);
 
         /* Tell the control thread to exit.  The SCSI host must
          * already have been removed so it won't try to queue
@@ -842,7 +842,7 @@ static void usb_stor_release_resources(struct us_data *us)
 /* Dissociate from the USB device */
 static void dissociate_dev(struct us_data *us)
 {
-        US_DEBUGP("-- %s\n", __FUNCTION__);
+        US_DEBUGP("-- %s\n", __func__);
 
         kfree(us->sensebuf);