scsi: uas: move eh_bus_reset_handler to eh_device_reset_handler
authorHannes Reinecke <hare@suse.de>
Fri, 25 Aug 2017 11:57:01 +0000 (13:57 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 25 Aug 2017 21:21:10 +0000 (17:21 -0400)
The bus_reset handler is really a device reset, so move it to
eh_device_reset_handler().

Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/usb/storage/uas.c

index 5ef014ba6ae86917f34e6ebbd855845e3bf71732..cfb1e3bbd434715410e1f78914bb6ac3eb004b76 100644 (file)
@@ -737,7 +737,7 @@ static int uas_eh_abort_handler(struct scsi_cmnd *cmnd)
        return FAILED;
 }
 
-static int uas_eh_bus_reset_handler(struct scsi_cmnd *cmnd)
+static int uas_eh_device_reset_handler(struct scsi_cmnd *cmnd)
 {
        struct scsi_device *sdev = cmnd->device;
        struct uas_dev_info *devinfo = sdev->hostdata;
@@ -848,7 +848,7 @@ static struct scsi_host_template uas_host_template = {
        .slave_alloc = uas_slave_alloc,
        .slave_configure = uas_slave_configure,
        .eh_abort_handler = uas_eh_abort_handler,
-       .eh_bus_reset_handler = uas_eh_bus_reset_handler,
+       .eh_device_reset_handler = uas_eh_device_reset_handler,
        .this_id = -1,
        .sg_tablesize = SG_NONE,
        .skip_settle_delay = 1,