diff options
Diffstat (limited to 'drivers/usb/storage/scsiglue.c')
-rw-r--r-- | drivers/usb/storage/scsiglue.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 521f0297aef9..3fcde9f0fa5f 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c | |||
@@ -228,12 +228,12 @@ static int queuecommand(struct scsi_cmnd *srb, | |||
228 | { | 228 | { |
229 | struct us_data *us = host_to_us(srb->device->host); | 229 | struct us_data *us = host_to_us(srb->device->host); |
230 | 230 | ||
231 | US_DEBUGP("%s called\n", __FUNCTION__); | 231 | US_DEBUGP("%s called\n", __func__); |
232 | 232 | ||
233 | /* check for state-transition errors */ | 233 | /* check for state-transition errors */ |
234 | if (us->srb != NULL) { | 234 | if (us->srb != NULL) { |
235 | printk(KERN_ERR USB_STORAGE "Error in %s: us->srb = %p\n", | 235 | printk(KERN_ERR USB_STORAGE "Error in %s: us->srb = %p\n", |
236 | __FUNCTION__, us->srb); | 236 | __func__, us->srb); |
237 | return SCSI_MLQUEUE_HOST_BUSY; | 237 | return SCSI_MLQUEUE_HOST_BUSY; |
238 | } | 238 | } |
239 | 239 | ||
@@ -262,7 +262,7 @@ static int command_abort(struct scsi_cmnd *srb) | |||
262 | { | 262 | { |
263 | struct us_data *us = host_to_us(srb->device->host); | 263 | struct us_data *us = host_to_us(srb->device->host); |
264 | 264 | ||
265 | US_DEBUGP("%s called\n", __FUNCTION__); | 265 | US_DEBUGP("%s called\n", __func__); |
266 | 266 | ||
267 | /* us->srb together with the TIMED_OUT, RESETTING, and ABORTING | 267 | /* us->srb together with the TIMED_OUT, RESETTING, and ABORTING |
268 | * bits are protected by the host lock. */ | 268 | * bits are protected by the host lock. */ |
@@ -299,7 +299,7 @@ static int device_reset(struct scsi_cmnd *srb) | |||
299 | struct us_data *us = host_to_us(srb->device->host); | 299 | struct us_data *us = host_to_us(srb->device->host); |
300 | int result; | 300 | int result; |
301 | 301 | ||
302 | US_DEBUGP("%s called\n", __FUNCTION__); | 302 | US_DEBUGP("%s called\n", __func__); |
303 | 303 | ||
304 | /* lock the device pointers and do the reset */ | 304 | /* lock the device pointers and do the reset */ |
305 | mutex_lock(&(us->dev_mutex)); | 305 | mutex_lock(&(us->dev_mutex)); |
@@ -315,7 +315,7 @@ static int bus_reset(struct scsi_cmnd *srb) | |||
315 | struct us_data *us = host_to_us(srb->device->host); | 315 | struct us_data *us = host_to_us(srb->device->host); |
316 | int result; | 316 | int result; |
317 | 317 | ||
318 | US_DEBUGP("%s called\n", __FUNCTION__); | 318 | US_DEBUGP("%s called\n", __func__); |
319 | result = usb_stor_port_reset(us); | 319 | result = usb_stor_port_reset(us); |
320 | return result < 0 ? FAILED : SUCCESS; | 320 | return result < 0 ? FAILED : SUCCESS; |
321 | } | 321 | } |