Received-SPF: pass (google.com: domain of linux-kernel+bounces-92362-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
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH 4/6] scsi: aic94xx: Use LIBSAS_SHT_BASE
Date: Tue,  5 Mar 2024 12:24:50 +0000
Message-Id: <20240305122452.340471-5-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?kT3EP5Mv9mYmXs/P8pL6uSeIOlAPQo/whv6yVcBIDUqVzf09/rTvsVBAMhHK?=
 =?us-ascii?Q?RfDpFjhrIiwkGEaHbJI2Mtbrk5qf3xGHD8c8RYNZrxzPjooP3F6L0e0b2FNJ?=
 =?us-ascii?Q?VuzmljthI1vLxMq67XoFfk5d+LskdzIoF4INR2+pHg8wrfQsG9ZdMplCulTS?=
 =?us-ascii?Q?GaZ9gHPVqVfDzZ0q7NgjXeSzq6GndoDsnZPM0b6GCb8XKKSh52YMwsLMJK+E?=
 =?us-ascii?Q?d+Rgi34KSaUZROS5bxiumkH5f7a+OMmluXP5uGwow+4EBYRooQXCAcO9dFa0?=
 =?us-ascii?Q?652TNq0eGdd4q07KthmfeX5gQf0Mm/idrJS+w8S2UlSMr9WhNgRUdgjeoy2B?=
 =?us-ascii?Q?lH8sKEfhhEYT57p6Avcvo7/j+PebMKkq8xV50geM9zHxFi3lGTAzy938VDmk?=
 =?us-ascii?Q?ThXnW7CY6jTlSrpcSJd21W/HoGWhs50s/06t2f3bj7tqgbeXLs9MXH9lBf4V?=
 =?us-ascii?Q?v9i4ZBajXIMKVFp0H9xqGjtKy7ohaIqkXVfupDkDsyY2PH4ztb71KC4d+0/o?=
 =?us-ascii?Q?Ke8glBKdRuDbWBb6Nd+AMbnCyv6YhJbMUntDKZNTZo3+zk8uMBEHQp0FKQvs?=
 =?us-ascii?Q?gHt8PkcB8eXPjqrDiNqO0f4u4Scr54Nydo0KS6n4jEslTYhlprlHTG2KA7U3?=
 =?us-ascii?Q?5iBT6DCin64G2e9Dso3mcHjGH79v5/ATTBzuu3XXyXNjoROLogrPI3OYWvXu?=
 =?us-ascii?Q?Z3Ay7dUTHK7gw6qNb+kScmsmGXGpt6j0Jh8fcINk1e1l+blkz7MDHi1lScpB?=
 =?us-ascii?Q?HeSytrYhNhjcMMM2qtWLFcvd5LpBLvLiPa/5qc+QyjlqevOOiRwGseQAmZWW?=
 =?us-ascii?Q?d811Ilkr4tPKXLliTelTa3lMaMy7FLRVgROTzIcMJRszmTzCVRoSrLye5epD?=
 =?us-ascii?Q?Ntx9LPHuf6VfLweoG2ooGkgybALVspocwzpCmxHhE3VoCD8KFZDHNfFgcHyn?=
 =?us-ascii?Q?vnhiMfHk0c8EdH9iMOr7iT9SoAph3IRwKqabexvvqhN5W6DiVddmDeMeWDL+?=
 =?us-ascii?Q?xR3etadp4U6Pz44+XwAWNSXKiL7XYFlt8vz3k1d/I9LdCPgKnjHDYKljXlO+?=
 =?us-ascii?Q?g2esgo674/nLv1B6EqZIi2rHIgCjDIzzwVihhNabCapm0OICcYbCyeS/pP5L?=
 =?us-ascii?Q?20QEwto8ukBO72/FXQkDcykpCrzeS69PHca4RPMCpy8MkxScVZA0UDG5Imuf?=
 =?us-ascii?Q?LXioKm03IJv4L+DOPtMp8Cvo3azhRdFVVOcQ807kFdpJ6/GFfDnsP9OA17pE?=
 =?us-ascii?Q?HhwhSHA5DhJL1E0mQ3n6R7UkMIhjWaGlI2W3Ea16HtE8LAQLqqJ1PKqoBy2f?=
 =?us-ascii?Q?SZ3lQtE8lXC2RXLu0J2Ylh0s11tpu5iHRjlffoTlcaGOBrJLm3+ucWmbj+ec?=
 =?us-ascii?Q?b2ekfXOH7cdvuLkOFaqV9iEHSiq06fDf5VsZoiQwvernKffOoPqBSwf68wRG?=
 =?us-ascii?Q?re8+FjD/HJyg/4ZwnXzk3zdd1iuIgI3wlwrjOpD1r2eg67Ui8Xs5v36wq7dN?=
 =?us-ascii?Q?6CZff7KGeIsv1+RqmRLw1odYbY2vrLuNi+ATNInnpH6J99VjmxLB8FyoF62x?=
 =?us-ascii?Q?C3GbMPqlNZvyMOlsWM7sb+O3vGlaG5vZWLG7YFVuWP58D0oez6ivCD4+LmKw?=
 =?us-ascii?Q?sA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	JDOdC0KU04DTb8TbDJBCfodhc6W4oX+pME+sXTsWDB7D0CJHzVQpOocCs+p6s3xHV7+EAecjqBdJ5NMs3R+1A/fZVXQZRAxLYZpgLfAnu1DRoDtpn/qyFA5+czLsDrow/6qAw+E8GkoJDlCwyzOtGFjz3wznH/eEQIboeHGmcvXnEIuNxGcHatdnkK0A1vMksyvxPNREL0V5xlkNMCw8ZgmAcwiNF4X9Iya1bt29dqc04QnT7cz86KJy1p0IpWdpan+EFGlWWuBrI6H7Mr88QBChx5259p8F0ycpNsHmr9i91cPLCUWBfHdaYLSblZP4jUA0Y7QcknWJp4GYu3hHtTGyZKhtYdFF84jmJ6ZC+NiJ3nF3TbJ1VBRqFHIIccrVzFcDkPZ46CEfQ9wK7skri6zZE3IcF+nvfNCB7OX8zVPaNr/dOfCMQS52EAPUikShvO0g3dPT6u75iaA5mn70MrSFP1wRtSOpm4+fzCul2NhpWhzRDJFCaALoazxuQ/Buqs5yiua6GSqeTDth4oNMSnJ62Z2V1bRYyxdD7BG4KReWKWwlwYOk1olDC89Rdxew8RrFvWMEeid1XhU9/fOpV9WR/9fUX/IagMQiF/VUPCI=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e76edef1-4a62-4bc5-8368-08dc3d0f502e
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:15.9892
 (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: 2PpgN7JiuBJbKlkAE3TWheqlmnxzNROqagzF97AmcGvGGiS1UxH4yuGdYCeYqVLp8v4pPmb+F9tvmwA3HJPpRQ==
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: RYeoyrUh_PwjvzDI_6-r6I71y_ikIUgL
X-Proofpoint-GUID: RYeoyrUh_PwjvzDI_6-r6I71y_ikIUgL

Use standard template for scsi_host_template structure to reduce
duplication.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 drivers/scsi/aic94xx/aic94xx_init.c | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index ccccd0eb6275..538a5867e8ab 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -25,6 +25,7 @@
 
 /* The format is "version.release.patchlevel" */
 #define ASD_DRIVER_VERSION "1.0.3"
+#define DRV_NAME "aic94xx"
 
 static int use_msi = 0;
 module_param_named(use_msi, use_msi, int, S_IRUGO);
@@ -38,29 +39,11 @@ static void asd_scan_start(struct Scsi_Host *);
 static const struct attribute_group *asd_sdev_groups[];
 
 static const struct scsi_host_template aic94xx_sht = {
-	.module			= THIS_MODULE,
-	/* .name is initialized */
-	.name			= "aic94xx",
-	.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		= asd_scan_finished,
 	.scan_start		= asd_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
 	.track_queue_depth	= 1,
 	.sdev_groups		= asd_sdev_groups,
 };
-- 
2.31.1