Commit d53e4d77 authored by John Garry's avatar John Garry Committed by Martin K. Petersen
Browse files

scsi: hisi_sas: Use LIBSAS_SHT_BASE_NO_SLAVE_INIT 



Use standard template for scsi_host_template structure to reduce
duplication.

Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarJohn Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20240308114339.1340549-4-john.g.garry@oracle.com


Reviewed-by: default avatarIgor Pylypiv <ipylypiv@google.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ad802f7f

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+1 −17
Original line number Diff line number Diff line
@@ -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,

};

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+1 −17
Original line number Diff line number Diff line
@@ -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,

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+1 −17
Original line number Diff line number Diff line
@@ -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,