aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/usb.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-03 19:08:34 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-04-25 00:16:55 -0400
commit441b62c1edb986827154768d89bbac0ba779984f (patch)
tree13724c22d1b190a36f0ddbba38554e6c66bea6af /drivers/usb/storage/usb.c
parent14722ef4acedc643f0b78b7165ceff2d300dae4d (diff)
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>
Diffstat (limited to 'drivers/usb/storage/usb.c')
-rw-r--r--drivers/usb/storage/usb.c16
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)
190 /* Wait until no command is running */ 190 /* Wait until no command is running */
191 mutex_lock(&us->dev_mutex); 191 mutex_lock(&us->dev_mutex);
192 192
193 US_DEBUGP("%s\n", __FUNCTION__); 193 US_DEBUGP("%s\n", __func__);
194 if (us->suspend_resume_hook) 194 if (us->suspend_resume_hook)
195 (us->suspend_resume_hook)(us, US_SUSPEND); 195 (us->suspend_resume_hook)(us, US_SUSPEND);
196 196
@@ -207,7 +207,7 @@ static int storage_resume(struct usb_interface *iface)
207 207
208 mutex_lock(&us->dev_mutex); 208 mutex_lock(&us->dev_mutex);
209 209
210 US_DEBUGP("%s\n", __FUNCTION__); 210 US_DEBUGP("%s\n", __func__);
211 if (us->suspend_resume_hook) 211 if (us->suspend_resume_hook)
212 (us->suspend_resume_hook)(us, US_RESUME); 212 (us->suspend_resume_hook)(us, US_RESUME);
213 213
@@ -219,7 +219,7 @@ static int storage_reset_resume(struct usb_interface *iface)
219{ 219{
220 struct us_data *us = usb_get_intfdata(iface); 220 struct us_data *us = usb_get_intfdata(iface);
221 221
222 US_DEBUGP("%s\n", __FUNCTION__); 222 US_DEBUGP("%s\n", __func__);
223 223
224 /* Report the reset to the SCSI core */ 224 /* Report the reset to the SCSI core */
225 usb_stor_report_bus_reset(us); 225 usb_stor_report_bus_reset(us);
@@ -240,7 +240,7 @@ static int storage_pre_reset(struct usb_interface *iface)
240{ 240{
241 struct us_data *us = usb_get_intfdata(iface); 241 struct us_data *us = usb_get_intfdata(iface);
242 242
243 US_DEBUGP("%s\n", __FUNCTION__); 243 US_DEBUGP("%s\n", __func__);
244 244
245 /* Make sure no command runs during the reset */ 245 /* Make sure no command runs during the reset */
246 mutex_lock(&us->dev_mutex); 246 mutex_lock(&us->dev_mutex);
@@ -251,7 +251,7 @@ static int storage_post_reset(struct usb_interface *iface)
251{ 251{
252 struct us_data *us = usb_get_intfdata(iface); 252 struct us_data *us = usb_get_intfdata(iface);
253 253
254 US_DEBUGP("%s\n", __FUNCTION__); 254 US_DEBUGP("%s\n", __func__);
255 255
256 /* Report the reset to the SCSI core */ 256 /* Report the reset to the SCSI core */
257 usb_stor_report_bus_reset(us); 257 usb_stor_report_bus_reset(us);
@@ -437,7 +437,7 @@ SkipForAbort:
437/* Associate our private data with the USB device */ 437/* Associate our private data with the USB device */
438static int associate_dev(struct us_data *us, struct usb_interface *intf) 438static int associate_dev(struct us_data *us, struct usb_interface *intf)
439{ 439{
440 US_DEBUGP("-- %s\n", __FUNCTION__); 440 US_DEBUGP("-- %s\n", __func__);
441 441
442 /* Fill in the device-related fields */ 442 /* Fill in the device-related fields */
443 us->pusb_dev = interface_to_usbdev(intf); 443 us->pusb_dev = interface_to_usbdev(intf);
@@ -816,7 +816,7 @@ static int usb_stor_acquire_resources(struct us_data *us)
816/* Release all our dynamic resources */ 816/* Release all our dynamic resources */
817static void usb_stor_release_resources(struct us_data *us) 817static void usb_stor_release_resources(struct us_data *us)
818{ 818{
819 US_DEBUGP("-- %s\n", __FUNCTION__); 819 US_DEBUGP("-- %s\n", __func__);
820 820
821 /* Tell the control thread to exit. The SCSI host must 821 /* Tell the control thread to exit. The SCSI host must
822 * already have been removed so it won't try to queue 822 * 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)
842/* Dissociate from the USB device */ 842/* Dissociate from the USB device */
843static void dissociate_dev(struct us_data *us) 843static void dissociate_dev(struct us_data *us)
844{ 844{
845 US_DEBUGP("-- %s\n", __FUNCTION__); 845 US_DEBUGP("-- %s\n", __func__);
846 846
847 kfree(us->sensebuf); 847 kfree(us->sensebuf);
848 848