From: Jason Yan <yanaijie@huawei.com>
To: John Garry <john.g.garry@oracle.com>, <jejb@linux.ibm.com>,
<martin.petersen@oracle.com>, <chenxiang66@hisilicon.com>,
<jinpu.wang@cloud.ionos.com>, <artur.paszkiewicz@intel.com>,
<dlemoal@kernel.org>, <ipylypiv@google.com>
Cc: <linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 3/6] scsi: hisi_sas: Use LIBSAS_SHT_BASE_NO_SLAVE_INIT
Date: Tue, 5 Mar 2024 21:18:02 +0800 [thread overview]
Message-ID: <26ff4850-2ff8-1625-cf97-6fbf063e26c7@huawei.com> (raw)
In-Reply-To: <20240305122452.340471-4-john.g.garry@oracle.com>
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@oracle.com>
> ---
> 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
next prev parent reply other threads:[~2024-03-05 13:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-05 12:24 [PATCH 0/6] Add LIBSAS_SHT_BASE for libsas John Garry
2024-03-05 12:24 ` [PATCH 1/6] scsi: libsas: Add LIBSAS_SHT_BASE John Garry
2024-03-05 12:52 ` Jason Yan
2024-03-05 12:24 ` [PATCH 2/6] scsi: pm8001: Use LIBSAS_SHT_BASE John Garry
2024-03-05 12:52 ` Jason Yan
2024-03-05 13:16 ` Jason Yan
2024-03-05 12:24 ` [PATCH 3/6] scsi: hisi_sas: Use LIBSAS_SHT_BASE_NO_SLAVE_INIT John Garry
2024-03-05 12:54 ` Jason Yan
2024-03-05 13:18 ` Jason Yan [this message]
2024-03-05 12:24 ` [PATCH 4/6] scsi: aic94xx: Use LIBSAS_SHT_BASE John Garry
2024-03-05 13:09 ` Jason Yan
2024-03-05 12:24 ` [PATCH 5/6] scsi: mvsas: " John Garry
2024-03-05 13:19 ` Jason Yan
2024-03-05 13:28 ` John Garry
2024-03-05 13:47 ` Jason Yan
2024-03-05 15:26 ` John Garry
2024-03-05 12:24 ` [PATCH 6/6] scsi: isci: " John Garry
2024-03-05 13:21 ` Jason Yan
2024-03-05 13:27 ` John Garry
2024-03-05 13:54 ` Jason Yan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=26ff4850-2ff8-1625-cf97-6fbf063e26c7@huawei.com \
--to=yanaijie@huawei.com \
--cc=artur.paszkiewicz@intel.com \
--cc=chenxiang66@hisilicon.com \
--cc=dlemoal@kernel.org \
--cc=ipylypiv@google.com \
--cc=jejb@linux.ibm.com \
--cc=jinpu.wang@cloud.ionos.com \
--cc=john.g.garry@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox