OSDN Git Service

scsi: mvumi: remove fake transport template
authorChristoph Hellwig <hch@lst.de>
Mon, 30 Jan 2017 12:18:56 +0000 (13:18 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 7 Feb 2017 00:08:17 +0000 (19:08 -0500)
These days we can specify an eh_timed_out handler in the host_template,
so don't have a transport_template definition just for it.

[mkp: fixed typo]

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/mvumi.c

index 3928507..247df5e 100644 (file)
@@ -2225,15 +2225,12 @@ static struct scsi_host_template mvumi_template = {
        .name = "Marvell Storage Controller",
        .slave_configure = mvumi_slave_configure,
        .queuecommand = mvumi_queue_command,
+       .eh_timed_out = mvumi_timed_out,
        .eh_host_reset_handler = mvumi_host_reset,
        .bios_param = mvumi_bios_param,
        .this_id = -1,
 };
 
-static struct scsi_transport_template mvumi_transport_template = {
-       .eh_timed_out = mvumi_timed_out,
-};
-
 static int mvumi_cfg_hw_reg(struct mvumi_hba *mhba)
 {
        void *base = NULL;
@@ -2451,7 +2448,6 @@ static int mvumi_io_attach(struct mvumi_hba *mhba)
        host->cmd_per_lun = (mhba->max_io - 1) ? (mhba->max_io - 1) : 1;
        host->max_id = mhba->max_target_id;
        host->max_cmd_len = MAX_COMMAND_SIZE;
-       host->transportt = &mvumi_transport_template;
 
        ret = scsi_add_host(host, &mhba->pdev->dev);
        if (ret) {