Received-SPF: pass (google.com: domain of linux-kernel+bounces-92363-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: John Garry <john.g.garry@oracle.com>
To: jejb@linux.ibm.com, martin.petersen@oracle.com, chenxiang66@hisilicon.com,
        jinpu.wang@cloud.ionos.com, artur.paszkiewicz@intel.com,
        yanaijie@huawei.com, dlemoal@kernel.org, ipylypiv@google.com
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH 3/6] scsi: hisi_sas: Use LIBSAS_SHT_BASE_NO_SLAVE_INIT
Date: Tue,  5 Mar 2024 12:24:49 +0000
Message-Id: <20240305122452.340471-4-john.g.garry@oracle.com>
In-Reply-To: <20240305122452.340471-1-john.g.garry@oracle.com>
References: <20240305122452.340471-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?aYuZrTVODFBqJfYb+AFyShrsoFEUjJK5uPxalmZVSnNfpRHdiiZEKVz1b/TL?=
 =?us-ascii?Q?l/bVL9A99SydQ+NpLxpUlUHPXZzdL4QAUnoYP7Vx4/asX5TwzaCmgwR54oIG?=
 =?us-ascii?Q?fwwfkZQf2Pm3ELHEJaCsmmC+Lh5VoQ3aL0PZyz5gsYADJH54A0xIoS+U4rjy?=
 =?us-ascii?Q?vSjz16b5lDUkS1AiqNEELh9/M7HAH+UQL/kUojemxUTcubOiZfZMKkZkoXs3?=
 =?us-ascii?Q?zmRTHLDujER0OmFtHh2o6ryl0sEdGH38bQOaKTo59bBEMMVPiiIGIdgeW2Oo?=
 =?us-ascii?Q?5fmp5TDvNJaAoZA2gKMeVN73lpZ+WBiUTW36453UhSCtLFbgtKaQSwUjtxD5?=
 =?us-ascii?Q?7VNRruXLy0KzHimmzXwLfUJf6L1q72hjZdBulnShnmtcHQQAa/d8PeALepZD?=
 =?us-ascii?Q?piq7wzjf5iBuGV4cQF0ow/Wu3EBY+L+Gu+IjroUtSlwCR9QWQtV4lO4Kxhgp?=
 =?us-ascii?Q?3rqD7N3OEsqZ3As1KeA8lJajSIdlCCYsnWAxrze/eYBSqsuMmd2AXDCYZKnX?=
 =?us-ascii?Q?wnsaEJ1V+evvK3XiJAwdMsuck99coZ0W03KspeYtsSVHtgRTMNKiOQKjJLJG?=
 =?us-ascii?Q?qYnWOommoHYxeJPxxdyTXKRZbDiETwnC7cvD5puBVACxkF9+HOFOSTPlzfAP?=
 =?us-ascii?Q?gvG8zOAynwDLM92am0GMJj1XpTzR4wHPEiSXD646qYfZq4xHo5if5xI6mDMg?=
 =?us-ascii?Q?naIUxjiSb4orX9wFxvy0uhXc2Y1AXWKl2OKgNCRaE8MZO4O101kM2fCfkgxr?=
 =?us-ascii?Q?s/TpRkEbNucwbwXo1UwvTx1Iv5AMMSKTrcJOOP7tbkiDniEKh9CzBkVHnozP?=
 =?us-ascii?Q?a9ms5TeVGWcZBnoeW4VP4cy0t3/4fTZuMgOY5l+NAJ+nObPD/INTULrjBM41?=
 =?us-ascii?Q?k3raVxudmTwEywCAB/CXTcBsAFL5ihs9W5P2tFel9qi7kYUvjWiDn0sY/wif?=
 =?us-ascii?Q?LV7KCGpwkhvOEYtZz3EkRKki5iaRd5Qalv0Zkoet0INLdTiZ0vSWBTq2h1pI?=
 =?us-ascii?Q?JN7Artl+RDGtCzbW1umqKvGY76NB4SOfGBG3oO3nN3QIfx6XUk+qx8Prjchk?=
 =?us-ascii?Q?FNemLJkv1zHc7LQx4ww5BXXfNgOgVjFkw61S17sqGe5qqqlGTjksiFjyaVf9?=
 =?us-ascii?Q?Iciz9AiU78xH5eQuC4v+V5ln8YNTlQxgK6JIS9yxP+UpfKLjZsRzyDYJkbin?=
 =?us-ascii?Q?GZS6Erw6YhhZTnFh3Db+DWim9VeVMKCwkYDnQVPfcoOeYFu/4jAednefFRAL?=
 =?us-ascii?Q?U4dV0SBZTcxndpSrb3dhm45cDWq461zPFa3lpRmpU3ytM9/L+vJW2J8bQCSe?=
 =?us-ascii?Q?bIznRsuPNsP+FOXKwb/YpCAxyKsPxwMjwzrmLWG3od/qYtgqVn+lmKSJU8jh?=
 =?us-ascii?Q?lDdr7cc2hRigkxWv8BFjP+BaYVYLKRbDiMnNSHW/GF4Aq+u4M/Cj4uzB5BqB?=
 =?us-ascii?Q?S4pasKsqB/40Bb3N2X/CwjnskRW5BuV0oe4szoLA7Z9aiNvzNpYUKe+QFfZl?=
 =?us-ascii?Q?EYMz7sGpbNJ/8Njm0/RMLAiMB815u8Hlo8nnuQLDbYDqX9PXmxxcatKqO0dZ?=
 =?us-ascii?Q?FRnK3cL5CRw2vIP6ZnZiBG+C5Uso11EZLxuZL2O9M+JhQtMoq0O63OWcLhyq?=
 =?us-ascii?Q?Jg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	uAkX712/xQrIeeqyZV3lwbbiIcr9g2NCtRUwIhmkYoWRPwJsKXXsJ7GI9/6Erg6wLXaA9QJWtfUtNnKKH5cbO22K56B3du0cHKntfdr4q3dW2nZgdhN1E8EBFIcSvf8x36N/cn8um3vfSbpJ01zoZQ4Ws5VWDkEuVf0ulFpDKkGA2DhT0R5C/oYyL4skYbseZZ1rsTuOuJFolTG/R++cLZQhdcl8eyRSJ35S84S1YwdaEE7hFt6VHymdhPUiyLfbQ+KUIS2AKq7Hk7IQo3YpD8WwiU0vS/BDcjnWv3yzrxAcuFoC2CRPsI4m15goE1oRJDkaLdf7zRNA8+Ct5aIiQW7gxYkItFsg+DPMpeml06JEEjiadPJ063IRX9ogiyeSZ3otdOJWQJB2jumwmmlY4LPBhMUm9HUSRwqIpFnbp94O35gXF28RJC3cAqu1JV15fhzYYutTyTqDtT5R28cdmHAds3vA9objsV3kXMlkQsHYUD3iETUA0upJCstDR2QvPWmyLjsApZuJYi6r1Kc9aXF3qojhhIHmSeMjSWIeOANdSQYCxH4TaeUqE1Ou/IRI+OcY1QAm0lqHmrWcWP6CCnQHIJ9KQk4ujwUFAkw9CCw=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 20fa29f2-d70c-4aab-f980-08dc3d0f4f6f
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 12:25:14.7325
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Zqx4x1z3HfLJlBbo9/MweGrujMMKGUKxMKAUr4YEunN++MUbJsA43OFNis2QVMsUOrtnQh+YDYtm5NR7BdSRSw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6507
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-03-05_08,2024-03-05_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0
 adultscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 malwarescore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2403050099
X-Proofpoint-ORIG-GUID: l2VgYEvPw5ihwECjbr3R24HrA6gcWAXU
X-Proofpoint-GUID: l2VgYEvPw5ihwECjbr3R24HrA6gcWAXU

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,
-- 
2.31.1