Received-SPF: pass (google.com: domain of linux-kernel+bounces-96950-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
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 5/6] scsi: mvsas: Use LIBSAS_SHT_BASE
Date: Fri,  8 Mar 2024 11:43:38 +0000
Message-Id: <20240308114339.1340549-6-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?QA1T3kjoyUyrUqCKpP4Y2iXY8PnPFFFfbtphTu5QFjIaNR8E/guudLc+CRM5?=
 =?us-ascii?Q?X+G2qSeR4pWo6D9xuqqwf722/c3VAeS++t1ZTA/cbV/2ynOp9f0aJ4i02HTD?=
 =?us-ascii?Q?jLReieYGAKAxl1PqxXr3bU9nVdcUkT/n+g3wbCfgYnbfUuU3l5u4BB33++Li?=
 =?us-ascii?Q?lPKeBTVx614A54HxIDWENTtUsLviWRkJauA4GkiWwlCqx6X2N5mGnY22XPKH?=
 =?us-ascii?Q?aW4u5/7hb/sMxfpOSqPbcI7FGhTDGoVt04o76lNh4A+TDd/PHcdX90GarJZS?=
 =?us-ascii?Q?fE3FthLXqJQ1mWWFffEBC2RbgxW+k3vPDuewjvYMYHEgfBJ4eP9+smT40Bgx?=
 =?us-ascii?Q?xpUk+tWs8oUlyqVHRaUOCFZgzzQWMvYILoVSsPC8OwXog0FoThTtMfoS+l2H?=
 =?us-ascii?Q?uD9tMziVgkTciAQG3WnzgwaQIbEOgdydDEiySFevqpkHmP+KRbGGDaGIJ7Nl?=
 =?us-ascii?Q?OPLnkgBCGA8AbkVn43rRqxojzA3bR6JzPMvQQ8pggdQS/8bhWLTVWo9MD27D?=
 =?us-ascii?Q?HmtPkBOObmm0Nyr8t0cWG4StzP18NhCNEi/8nG90DjvVn6DNZ31ewSg6S8S0?=
 =?us-ascii?Q?SUGxLbMo6i/RxhOxSXfBnnpEdnZpUIDhO4Po2ppj1bB3RNc1cHOoGJ3jVrAh?=
 =?us-ascii?Q?GkZp0NhFypc5l3oU5/P3Bywr9D83Tbk+7LH9x1RfdnCl7bXyHQlitTM6QERb?=
 =?us-ascii?Q?geoBoUqOh5cQPWuLWmannXd9Hq1/OdBRIO+ip5H9yUgoioiOKrIDx7G1lopu?=
 =?us-ascii?Q?rBOencuXYAXTS8fLpjLUTwsEplM+ueBXi/prddXvHl81qkvmtqPqkzqB3WxG?=
 =?us-ascii?Q?W0HH3SQZMvLBDhM5w4SizLkgfNRJCVBEhsqCir/N9Ac+Vcb03f58qLtwSgGr?=
 =?us-ascii?Q?ahKdZ+hNfJTn9C5e6HgcoQ1806v2LPdDteJ+guKvVhfRl/Q909E+q95AoEaf?=
 =?us-ascii?Q?GOasTY4j48uhPKnMyGrs/RGdQ67Hwd0lxcMmq5sjVVEIBtJCw2AbvLtLZuzU?=
 =?us-ascii?Q?URjdGaD9Tujj3PNDSEoCZ5KlUmviah7lVGAi9Rm3ZbHn1KOOYk6rzXg40sPZ?=
 =?us-ascii?Q?9KcZ8zfD1yAQ0L7g86W80QRfconOUnXtvHGCgZBGj68FQ/xcnVXkRX1VbzEY?=
 =?us-ascii?Q?6QSkuzRqRMtrTB1lbALdsDGtvbSSF319IeYVjx1q5ItpfyamO3Vqgw0UjgXI?=
 =?us-ascii?Q?ISRXr/3q+KU30USAkxUSk8RWxn7dXqav54ZO5rgagTGmeGMuLvi4aa8MZVUU?=
 =?us-ascii?Q?W+NINO7p5k1RKPiaO6DmSNMAk7/P1xaNhwpY5mhHyHnDr9+ls9Lym+CO0Yq3?=
 =?us-ascii?Q?iGHixN8XqotmPXaguHlcoKJq/Fr5G7odv1P9ObYxRK3qC0GG8nSh1dX/3wHG?=
 =?us-ascii?Q?NE7OScKoF1XdMARuIEgCre5f/fV30k00vUOBu237g9LVgNGsr96+103h5GDH?=
 =?us-ascii?Q?3S5mCxfWui77fdOwZVYz9+4wDS4WNqy6uA62H/7xpm9jMGGHlewrgX95m6MG?=
 =?us-ascii?Q?FTQZ3Qxb/IVH3j4adRjIAS+kxQ9ItoSJLZjijDsLwk9QgXoSj2PhO9zkE87c?=
 =?us-ascii?Q?7UwV0RJDB4/E5SphLp2GReD6weKtGFitq6+4YMlq6jtpWLP9+BUeQM6Tc7ZA?=
 =?us-ascii?Q?4A=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	2h4Pu5eRvPlWum8mgWwENmVNhjPppwm6Rvl6w81XGdhlNRE4jAujKVnuDcie2eqZwG6kVH8PwOm4mqA3JY6715kytdqrRzgRUoND36NpTRkWJqk8sj6COri8WOAgEJbgITVl7ozXbyefAnYUWh/l9GAJviedhndlvaIou+sKpNWTWTM1xMUzTxv4XJOTMwSLOnTstBiLWQrwC1pm+atTZauE6KKcpO++9K3CLqmow7/rlKmSbc+BjznzwUxiyrF35QTdFso+cOtKNZmW34j3UbwdCETcBgipA4EYXOZG4u3FRHxqphZ3Wi3W6cCddyiMY4rC46+aW+5DIxFg2a/gaeNzOcBNTKue6PNM2RPdu09gJFkEfYfNIjSibY/oqkqhsE0V6YHVhnJqNwZcLbfQ1miyoSUtJytgzyGEkfVi22NU28W5p9GbLOa8i6Vx11WhNy6hwLL/1ADSB1t5RFMT3JuQftSeLdYIzpxg6Ef4giSwnLkVK8ljOaV1ubcsivqejVPkUICA0MWs64RPFI19wFw5lgOSW4EU889uXJLbKeo/OJkMvLscSa+dCM7zz9o8GHPzxXaeHjIu9AgrshdBaaxA1CTU6Ydd4hSf1FKv4AU=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 570687db-77cb-415c-7c02-08dc3f650785
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:53.1301
 (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: SniJ6dP2u0sMEjCPMUEPc9oSveRORA9RANjRnoLHyo6SbeBUVXvVgCfcBVsk1vryDhNgKWA1iUfqRa6mwC3CeQ==
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 bulkscore=0 adultscore=0
 mlxlogscore=999 suspectscore=0 spamscore=0 malwarescore=0 mlxscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2403080093
X-Proofpoint-GUID: FEL7vWrqnaMGiEZ2F8HXmcW0dHJoDQkn
X-Proofpoint-ORIG-GUID: FEL7vWrqnaMGiEZ2F8HXmcW0dHJoDQkn

Use standard template for scsi_host_template structure to reduce
duplication.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 drivers/scsi/mvsas/mv_init.c | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index 43ebb331e216..fb81d267c9cc 100644
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -30,28 +30,11 @@ static const struct attribute_group *mvst_host_groups[];
 #define SOC_SAS_NUM 2
 
 static const struct scsi_host_template mvs_sht = {
-	.module			= THIS_MODULE,
-	.name			= DRV_NAME,
-	.queuecommand		= sas_queuecommand,
-	.dma_need_drain		= ata_scsi_dma_need_drain,
-	.target_alloc		= sas_target_alloc,
-	.slave_configure	= sas_slave_configure,
+	LIBSAS_SHT_BASE
 	.scan_finished		= mvs_scan_finished,
 	.scan_start		= mvs_scan_start,
-	.change_queue_depth	= sas_change_queue_depth,
-	.bios_param		= sas_bios_param,
 	.can_queue		= 1,
-	.this_id		= -1,
 	.sg_tablesize		= SG_ALL,
-	.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		= sas_slave_alloc,
-	.target_destroy		= sas_target_destroy,
-	.ioctl			= sas_ioctl,
-#ifdef CONFIG_COMPAT
-	.compat_ioctl		= sas_ioctl,
-#endif
 	.shost_groups		= mvst_host_groups,
 	.track_queue_depth	= 1,
 };
-- 
2.31.1