Received-SPF: pass (google.com: domain of linux-kernel+bounces-96953-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
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,
        cassel@kernel.org
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH v2 3/6] scsi: hisi_sas: Use LIBSAS_SHT_BASE_NO_SLAVE_INIT
Date: Fri,  8 Mar 2024 11:43:36 +0000
Message-Id: <20240308114339.1340549-4-john.g.garry@oracle.com>
In-Reply-To: <20240308114339.1340549-1-john.g.garry@oracle.com>
References: <20240308114339.1340549-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?qnseNFrnwqtwbmMxleFfQCAbCROgAIc4J81nACE4NLre04N62CayhSAi1Le/?=
 =?us-ascii?Q?sX3CDKWq3wGSI6nbaFXqe20nKVCQ7zmq63pB0jYVgtE8Zq/WfJk7fzqfs6sH?=
 =?us-ascii?Q?g+4lw6XeYKlBvDErHE0BOcxCgaK4L6XkNqqM1CcSRggEtglEBVEOgaNsd02N?=
 =?us-ascii?Q?7osjAT2PcxbNSY1CgDrMbrwQy1DIVA/YoPohP8djGPKGcBu/bZlsZHfw1+rr?=
 =?us-ascii?Q?GPeC1p2BEVITXXAwM7qJpfLA+gIcGD2miG9p9sCi8swcauiJIQ+uJcYBjxI6?=
 =?us-ascii?Q?5lZmb9yXc6iGEc/DxrctX8XlOoox9/PGSO2ulJvJ2dwP7q6ffDLhoVgNB1EY?=
 =?us-ascii?Q?vMKnn8/AWP2N3/QUS3LC2vAYrEdDObCpYSpiznsqnzl9VAfHTq0EV1yVWHdA?=
 =?us-ascii?Q?u5DEY/a3r8j4/LFO0uOkUJ6r5eyNnt2pL+y1rYF6kEp1zJV43uzOPIhye/UX?=
 =?us-ascii?Q?zCaY699aVsubtEYrcbE37Lc7++tpUquYugqIZTDfkuH0+obPNlG4HxvoiIkv?=
 =?us-ascii?Q?doDsh+MLzGRj6nXlmNVcMnK4JycKu+kEHBSxMrFBnxx/3lsp9N5FTsLmAZed?=
 =?us-ascii?Q?lTuzP9m1ob2n4z9rJW5vb6BXsyC2JNz6ad2EG9QQdgfibzKPhoKGioMZNmH9?=
 =?us-ascii?Q?nY6BLPp3xRjpfSKDYyGzTWtkHo7YbwY1wdAlV/X+bTQGQSw27C42q7ACmQWn?=
 =?us-ascii?Q?rcjKJSqR0y5DnjcLeQR873Z9+tbkMqKFOalDVDR9qx6ezssE3XSwIYLbzpeG?=
 =?us-ascii?Q?pqKjD/zZ2BUgDCL30q0bESTLCmwBetAjshuqTyTY/Y+pc0jhhdt85UCrFxak?=
 =?us-ascii?Q?hyUxSGgGxtoR9rAn+/wjnUS/ZVAw5mJM9pe7HITA7/Wrk0rnbO2JH0xlQA4n?=
 =?us-ascii?Q?iUMWyhT5fuvQ4IoSfi4dbghSfaFt/U7Jo6LfrIpH7/87fbzgWO9JAz9eoKBW?=
 =?us-ascii?Q?26KW6yhvL4XC/aBrw8NucGiemeqI+W3WitCT2Srm8iAM2MJqIkf9vyloQi7o?=
 =?us-ascii?Q?c4dVZCkzW0+YJxfRbh6HAEzlTlIn7Sz9itYrnptQzuhWRnxcvfFpxFli8agn?=
 =?us-ascii?Q?dQsVrOaNpPVExUOrdDVSLPH9Lvq5Z3n/8cizAbU5GJJAgGV6R07+0Evox7gK?=
 =?us-ascii?Q?YxEFbFIgMF0wjY6achaD2Qxe4f7fNUT/EbjNHMgs2YaxPyyRCRv7NesP5Bke?=
 =?us-ascii?Q?g+vZBFTYApo+x4Vmu5SGBlJErc27XI8yEbPYIwOKBjCb4bcaezlUOCdbP8xg?=
 =?us-ascii?Q?6PnZH6qpMW08PpuN7zYGwQigERlzFDbyfIyycYKgtpRsb93XE5dusxb5Edop?=
 =?us-ascii?Q?wqUNFjxCovKStEZwIOKLJbAKZMFx/7z2bpJOZCMmocKhRHhZ1AoHe/sUsIMg?=
 =?us-ascii?Q?X0v5n8RPPTR9Cxc+TT79D5S1/MKhau8oZ9z/5zRQsdCe0cy2a3ihzrapo3iM?=
 =?us-ascii?Q?pSIVBGVYHxscPrVtLzmc0Sg2McPMRQmdTYYsRMz1xPPv9igsD5imJfkI79OC?=
 =?us-ascii?Q?/j8ElVEgAHYvmcyrt2CWY7ZOEP2wGThopHf74Y9lq1+bIpmdezV06l/+NXjO?=
 =?us-ascii?Q?BunM8lhipgL9Wt5MhiYVOYX533owbdKvHjCmhXeT/g70Z22YJzjEUTncTmw1?=
 =?us-ascii?Q?ig=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	fNhRBgRxfGVMhaB2v//4put2dpPKQ4lx5lJ5cCwCEA57Dej6rvT9OrmroXYAaUqM+Rk4QTj0E/7YrxT+azd/FIlJulwbc1PQ604yVkejC83gwXp315iUVo8lpp59Ja7RgTEc/0oLHsJx93hFIjhwkKZLGYyzn40OfVNfe1fN8TpBuEDVVQPtT7+XZx7xoZjD9eA40uAskip9W7hA+tKCnD2a8625PUz2mEIwMk3AicbL3uf1iTBvNEdxabMGwhS/4KjdG0PyU6nECGLyuDK8G/SqbTWQXEdEOKHXapP6+B2lHN0vTmz5C8T0U2HEXeSLnqC4SBs3B48q6mHYgoalDUUH4T+W3h3/mzvAT9nCwi1oOc0DM7xpovPUpX8HcE6ARnuuv4Lrq/Z8NHG8iKJFaFcPXITXGyRLedkd1GtQjCfUBhgz0tPk6RJFYcog/4r5sWisbg6OPrBHLn5H165nGCjq5ZYgt5BaVvPYiFJIzQca2P+7PBPb27hIMiuv+BgfL6zUOkRgZwI/IQRmxANkEAXp7E3FCliNAYSyqleinR6nPIhDBDmKwC3h3SelAXGDzxfzOOhWkwuIt+GRtsONZM04uFa1fcJainFI7xUqSQ4=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bf5b0772-75b0-4a6d-c625-08dc3f6504e4
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2024 11:43:48.6915
 (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: bwnNltxn93rrprVVvMIw+0ti+zzizs6HnUjKYn01bQ6U+EteAi7oAwXRwZuIdx/OHb7QbWoYOt0U1qUSAPcD9g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4595
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-08_08,2024-03-06_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxlogscore=999
 spamscore=0 phishscore=0 mlxscore=0 malwarescore=0 bulkscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2403080093
X-Proofpoint-ORIG-GUID: rn3o3K76By7yq1CAL2qe0QPWA07HpGKk
X-Proofpoint-GUID: rn3o3K76By7yq1CAL2qe0QPWA07HpGKk

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>
---
 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 73b378837da7..b8646f6e4c6d 100644
--- 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 7d2a33514538..16ef89002fd4 100644
--- 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,
-- 
2.31.1