scsi: hisi_sas: Use LIBSAS_SHT_BASE_NO_SLAVE_INIT

Use standard template for scsi_host_template structure to reduce
duplication.

Reviewed-by: Jason Yan <yanaijie@huawei.com>
Signed-off-by: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20240308114339.1340549-4-john.g.garry@oracle.com
Reviewed-by: Igor Pylypiv <ipylypiv@google.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index 3c555579f9a1cf04d2011c88efbdbe3abc808cb8..161feae3acaba272253e7ce8dd38660b3d52b368 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -1735,28 +1735,12 @@ static struct attribute *host_v1_hw_attrs[] = {
 ATTRIBUTE_GROUPS(host_v1_hw);
 
 static const struct scsi_host_template sht_v1_hw = {
-       .name                   = DRV_NAME,
-       .proc_name              = DRV_NAME,
-       .module                 = THIS_MODULE,
-       .queuecommand           = sas_queuecommand,
-       .dma_need_drain         = ata_scsi_dma_need_drain,
-       .target_alloc           = sas_target_alloc,
+       LIBSAS_SHT_BASE_NO_SLAVE_INIT
        .slave_configure        = hisi_sas_slave_configure,
        .scan_finished          = hisi_sas_scan_finished,
        .scan_start             = hisi_sas_scan_start,
-       .change_queue_depth     = sas_change_queue_depth,
-       .bios_param             = sas_bios_param,
-       .this_id                = -1,
        .sg_tablesize           = HISI_SAS_SGE_PAGE_CNT,
-       .max_sectors            = SCSI_DEFAULT_MAX_SECTORS,
-       .eh_device_reset_handler = sas_eh_device_reset_handler,
-       .eh_target_reset_handler = sas_eh_target_reset_handler,
        .slave_alloc            = hisi_sas_slave_alloc,
-       .target_destroy         = sas_target_destroy,
-       .ioctl                  = sas_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl           = sas_ioctl,
-#endif
        .shost_groups           = host_v1_hw_groups,
        .host_reset             = hisi_sas_host_reset,
 };

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 73b378837da7bd210a741ec9e28c72cb31ad885f..b8646f6e4c6dec026134dc00c2b85bc942ca986b 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -3562,28 +3562,12 @@ static void map_queues_v2_hw(struct Scsi_Host *shost)
 }
 
 static const struct scsi_host_template sht_v2_hw = {
-       .name                   = DRV_NAME,
-       .proc_name              = DRV_NAME,
-       .module                 = THIS_MODULE,
-       .queuecommand           = sas_queuecommand,
-       .dma_need_drain         = ata_scsi_dma_need_drain,
-       .target_alloc           = sas_target_alloc,
+       LIBSAS_SHT_BASE_NO_SLAVE_INIT
        .slave_configure        = hisi_sas_slave_configure,
        .scan_finished          = hisi_sas_scan_finished,
        .scan_start             = hisi_sas_scan_start,
-       .change_queue_depth     = sas_change_queue_depth,
-       .bios_param             = sas_bios_param,
-       .this_id                = -1,
        .sg_tablesize           = HISI_SAS_SGE_PAGE_CNT,
-       .max_sectors            = SCSI_DEFAULT_MAX_SECTORS,
-       .eh_device_reset_handler = sas_eh_device_reset_handler,
-       .eh_target_reset_handler = sas_eh_target_reset_handler,
        .slave_alloc            = hisi_sas_slave_alloc,
-       .target_destroy         = sas_target_destroy,
-       .ioctl                  = sas_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl           = sas_ioctl,
-#endif
        .shost_groups           = host_v2_hw_groups,
        .host_reset             = hisi_sas_host_reset,
        .map_queues             = map_queues_v2_hw,

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 7d2a33514538c2cd8083733d8303f4dc5934de7d..16ef89002fd494e92aa1ce6b66c96e4a14188f83 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -3315,30 +3315,14 @@ static void hisi_sas_map_queues(struct Scsi_Host *shost)
 }
 
 static const struct scsi_host_template sht_v3_hw = {
-       .name                   = DRV_NAME,
-       .proc_name              = DRV_NAME,
-       .module                 = THIS_MODULE,
-       .queuecommand           = sas_queuecommand,
-       .dma_need_drain         = ata_scsi_dma_need_drain,
-       .target_alloc           = sas_target_alloc,
+       LIBSAS_SHT_BASE_NO_SLAVE_INIT
        .slave_configure        = slave_configure_v3_hw,
        .scan_finished          = hisi_sas_scan_finished,
        .scan_start             = hisi_sas_scan_start,
        .map_queues             = hisi_sas_map_queues,
-       .change_queue_depth     = sas_change_queue_depth,
-       .bios_param             = sas_bios_param,
-       .this_id                = -1,
        .sg_tablesize           = HISI_SAS_SGE_PAGE_CNT,
        .sg_prot_tablesize      = HISI_SAS_SGE_PAGE_CNT,
-       .max_sectors            = SCSI_DEFAULT_MAX_SECTORS,
-       .eh_device_reset_handler = sas_eh_device_reset_handler,
-       .eh_target_reset_handler = sas_eh_target_reset_handler,
        .slave_alloc            = hisi_sas_slave_alloc,
-       .target_destroy         = sas_target_destroy,
-       .ioctl                  = sas_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl           = sas_ioctl,
-#endif
        .shost_groups           = host_v3_hw_groups,
        .tag_alloc_policy       = BLK_TAG_ALLOC_RR,
        .host_reset             = hisi_sas_host_reset,