Received-SPF: pass (google.com: domain of linux-kernel+bounces-96954-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
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 4/6] scsi: aic94xx: Use LIBSAS_SHT_BASE
Date: Fri,  8 Mar 2024 11:43:37 +0000
Message-Id: <20240308114339.1340549-5-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?ktizAJvzR73OhARsi6nDB9aWkGJSM35Vp8DjppVlDQ9DN2N19ltBWTTyX4J2?=
 =?us-ascii?Q?5q/QgBaevvEt/W4XtJE+Ag4sMy/X5bCnf/6T7aVhdcwPHz8crsjuFd6zNA0O?=
 =?us-ascii?Q?pcbdy6ZdSn530HLJCpjtVYqCSXSsJEBUBoIQxjsnkzoC1GXGPlgZ0CGj1RQz?=
 =?us-ascii?Q?0WcG3zUb4cus004HQh2V9q+eaM3NrbcEgo7Qct2PP6vvnmofT86ECNl6EnVk?=
 =?us-ascii?Q?zs30yaX+kDk5rV8fItcpUOUwRgzTsXZbi/ukquD/vrU167laqSvYAXdGuBW+?=
 =?us-ascii?Q?NbPvQG638QJH60m7emdX3qifMa1rva+RcVoqePuPOCJKtvrkgKvzn1OEsxvt?=
 =?us-ascii?Q?vQGA832JZTeWkTcYKyOPSfhgJCdKm97Wnmak3TACTABj/W6Gz8Hb8rbyKxNP?=
 =?us-ascii?Q?CqWNFSnSe8dvWdird95k2lwKVsNpMA3pHIn2G3oJKfm4dSBW3kukEUyPrCNO?=
 =?us-ascii?Q?/F8ZatiMttmGyE2aotvUD3i03vfONhxkOSGF0pyndTXWoj2XUUwYpgGbVBCh?=
 =?us-ascii?Q?l2O1sRXzyZRTGrmu1mRIsiB8IhkvhsJFIaPFKc3+UQplTQN6BMcZW8LSOa3V?=
 =?us-ascii?Q?BK3Ynv+SzeMpOsTxulpBogfgvYCJwEiDf6/3gO400pK/F3dVKNCwbGsburfo?=
 =?us-ascii?Q?RsfGh1zTXYcYgemZHgCl3bVjvlJufXEOQ17Eln/5x+QSqae8BvT8LUMUbxb8?=
 =?us-ascii?Q?LReWpDDZX5y9IAaEC0sYwdNsMsc/VqiYHNg1cPzm/UyeBVXWL7TNyPgQmyH8?=
 =?us-ascii?Q?HjkR1ccU1DL+/OmS8xovhgdikC+V2xfzFtDSY5R7HCJKQCNkf8mNOmTZVYSY?=
 =?us-ascii?Q?M98unwfxTXhLD/DQ3/pa2ZYrEfuYdr3EOdRcOEwJUtoN71hlB4GBFqlyqe8n?=
 =?us-ascii?Q?EyK3/mgO7QuLNx//nOAuBA0eBNJWY24Fplnx9LDLssX2FPiTOSgBlNGya3VF?=
 =?us-ascii?Q?8HnXiUY7NF5lBQz0PnyW/MoPIWjNpgLnEyw9+SXVJlXzGmIcBE5Zd8hBCJ48?=
 =?us-ascii?Q?p+QZjJINBM6cxXE/XxfJXIxJrLU8g6X4pDV3zam/5O6ju7EKNcjKnV6xbD3p?=
 =?us-ascii?Q?2uLopkDplOeE2Mg4q3Z648J/0IgTCfuVY2VXI6eGSnPar2YzxGjBaHCsfVIb?=
 =?us-ascii?Q?fZbbxPlOeZLx9+k/M2bUvMOwhQiHaSq9dERkE4cj08IqFRW0HSpM5NXz94Yr?=
 =?us-ascii?Q?Y1xvoNHEaYPUqYCR3BW9RyoW9wnppppfF7bF9tVGxFYvNdOLYvD3zkmDc64z?=
 =?us-ascii?Q?qDbg1JWtA/Bq/z32VgVi6/zBCAJKWRJjk+aJf1XNVMUuWCutb7wv57GhHBfq?=
 =?us-ascii?Q?3M/zV76rFgtr+o9RCqzz6ieadoa+PwFZNk2CvOmlHmqKsZjEi5VLt1bqKtoU?=
 =?us-ascii?Q?LxdXUO4HOUO0QF6pAFSftPDnGHlM6LpJ/UydMdhYW0ar+Mh4Iu7oDplmxz6S?=
 =?us-ascii?Q?KOknIfCLW9aUna93oQ3QZxebrW9YI+D7xEiPn5IzQ3w5B3ZlaoCspwPh31Az?=
 =?us-ascii?Q?svuIb55MKtXtV+CKwOSbdol6QLQeJ6LKhLHlI7GitYqeJQmflZeoLmQWQHHN?=
 =?us-ascii?Q?0LbhGDD84a4NkMHW+boubDOV0c9lTUhci2Za4lbszi81zKzS4llFG3Zx9dx2?=
 =?us-ascii?Q?HQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	KtKa0CMafXr70jtcWybUc62evGVWM+17VWyJ60kv2NncoG8PdcXyCIsvuHdI3jUJtWiredtp6x2YpkyLMF6t5p+8Ml3qu1PTD6mCnUF5E+BtStE+5W/KdK6WhWjlA6noDM3ilGaD/W1irhd+Qqs4pl0Y6HW7Kndq/lPXNP06oRLE4vMH+R4w/bNgiWUl6T1r+pqBWknnRTIOeBteA7PpQPtoT2Cy5oVsOghaQrbMBHTRI4Hhon7gvTlbd/pn9bTZ8zbqwy813bZ3o6wQzxrblF52C09uWXGyV1B45ysI5x+014eut9AENJn+4IhuQHsd7IWRs0XV5mika3foAEYtv1f6NODREqa3BhYiKLP1QwBuc8RWKZ2MpCaKUWSBD8Lkud6BCyFTFze9Fjjh4weJOunAD4WGZQFCGbjcFaWyYbWkUZxuq3mOllZkJV5Vmr6w/ZVgbyLq92uE672WcLiMMNntsODUEjhD56cVzKksxKF7rJjpNwpX0H5AGy65YiaIgfYR3nirJPDG6kC5YFwUmoLVIsgsd6K2iGAJFeGznAdFrFy2qiVSKGGKNJ8kAZJqCfUhiuU5sEP/s1A41Vd1fDHErGhf8LoHOTN2ORvrx9U=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b466ec34-3f1a-47be-259a-08dc3f65061a
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:50.7180
 (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: ZIKsfjLHfjaMWxS+gt6rziv85MhlLMo1PhDoi/WAvGXIA90vAONJ3wqzfIjJHA+av46GrterJBXiXGeI0rNyDQ==
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: C7-OSEhjETJ73KhUHT2GPSJVl5tjS1p1
X-Proofpoint-GUID: C7-OSEhjETJ73KhUHT2GPSJVl5tjS1p1

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/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 8a3340d8d7ad..53fe68124ff4 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -24,6 +24,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);
@@ -36,29 +37,11 @@ static int asd_scan_finished(struct Scsi_Host *, unsigned long);
 static void asd_scan_start(struct Scsi_Host *);
 
 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,
 };
 
-- 
2.31.1