diff options
Diffstat (limited to 'drivers/scsi/scsi_sysfs.c')
-rw-r--r-- | drivers/scsi/scsi_sysfs.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index fa4711d12744..91482f2dcc50 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c | |||
@@ -420,29 +420,12 @@ static int scsi_bus_resume(struct device * dev) | |||
420 | return err; | 420 | return err; |
421 | } | 421 | } |
422 | 422 | ||
423 | static int scsi_bus_remove(struct device *dev) | ||
424 | { | ||
425 | struct device_driver *drv = dev->driver; | ||
426 | struct scsi_device *sdev = to_scsi_device(dev); | ||
427 | int err = 0; | ||
428 | |||
429 | /* reset the prep_fn back to the default since the | ||
430 | * driver may have altered it and it's being removed */ | ||
431 | blk_queue_prep_rq(sdev->request_queue, scsi_prep_fn); | ||
432 | |||
433 | if (drv && drv->remove) | ||
434 | err = drv->remove(dev); | ||
435 | |||
436 | return 0; | ||
437 | } | ||
438 | |||
439 | struct bus_type scsi_bus_type = { | 423 | struct bus_type scsi_bus_type = { |
440 | .name = "scsi", | 424 | .name = "scsi", |
441 | .match = scsi_bus_match, | 425 | .match = scsi_bus_match, |
442 | .uevent = scsi_bus_uevent, | 426 | .uevent = scsi_bus_uevent, |
443 | .suspend = scsi_bus_suspend, | 427 | .suspend = scsi_bus_suspend, |
444 | .resume = scsi_bus_resume, | 428 | .resume = scsi_bus_resume, |
445 | .remove = scsi_bus_remove, | ||
446 | }; | 429 | }; |
447 | EXPORT_SYMBOL_GPL(scsi_bus_type); | 430 | EXPORT_SYMBOL_GPL(scsi_bus_type); |
448 | 431 | ||