scsi: qlogicpti: move bus reset to host reset
authorHannes Reinecke <hare@suse.de>
Fri, 25 Aug 2017 11:57:08 +0000 (13:57 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 25 Aug 2017 21:21:11 +0000 (17:21 -0400)
The bus reset function really is a host reset, so move it to
eh_host_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/scsi/qlogicpti.c

index 69bfc0a1aea30f99319ad50c6ecaec0649cf8862..274ee1ccfea8d40c8c86cf8411e7a739cabbd8e4 100644 (file)
@@ -1250,10 +1250,9 @@ static int qlogicpti_abort(struct scsi_cmnd *Cmnd)
        return return_status;
 }
 
-static int qlogicpti_reset(struct scsi_cmnd *Cmnd)
+static int qlogicpti_reset(struct Scsi_Host *host)
 {
        u_short param[6];
-       struct Scsi_Host *host = Cmnd->device->host;
        struct qlogicpti *qpti = (struct qlogicpti *) host->hostdata;
        int return_status = SUCCESS;
 
@@ -1283,7 +1282,7 @@ static struct scsi_host_template qpti_template = {
        .queuecommand           = qlogicpti_queuecommand,
        .slave_configure        = qlogicpti_slave_configure,
        .eh_abort_handler       = qlogicpti_abort,
-       .eh_bus_reset_handler   = qlogicpti_reset,
+       .eh_host_reset_handler  = qlogicpti_reset,
        .can_queue              = QLOGICPTI_REQ_QUEUE_LEN,
        .this_id                = 7,
        .sg_tablesize           = QLOGICPTI_MAX_SG(QLOGICPTI_REQ_QUEUE_LEN),