Re: [PATCH 3/6] scsi: hisi_sas: Use LIBSAS_SHT_BASE_NO_SLAVE_INIT

[Jason Yan]

On 2024/3/5 20:24, John Garry wrote:
> Use standard template for scsi_host_template structure to reduce
> duplication.
>
> Signed-off-by: John Garry <john.g.garry@xxxxxxxxxx>
> ---
>   drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 18 +-----------------
>   drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 18 +-----------------
>   drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 18 +-----------------
>   3 files changed, 3 insertions(+), 51 deletions(-)
>
> diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
> index 3c555579f9a1..161feae3acab 100644
> --- 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 b5d379ebe05d..d89e97e8f5c2 100644
> --- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
> +++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
> @@ -3567,28 +3567,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,
>   	.sdev_groups		= sdev_groups_v2_hw,
>   	.host_reset		= hisi_sas_host_reset,
> diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
> index ebdfb7e7c88d..756660588a1e 100644
> --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
> +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
> @@ -3320,30 +3320,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,
>   	.sdev_groups		= sdev_groups_v3_hw,
>   	.tag_alloc_policy	= BLK_TAG_ALLOC_RR,

Doesn't hvae ->eh_abort_handler too.

Thanks,
Jason