Received-SPF: pass (google.com: domain of linux-kernel+bounces-92365-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::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 6/6] scsi: isci: Use LIBSAS_SHT_BASE
Date: Tue,  5 Mar 2024 12:24:52 +0000
Message-Id: <20240305122452.340471-7-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?/k8W5kMu9Eft4cw9iVFqMmUjMKpznYFEGgZ1y+9F1byRvQlTL5qEpeioIUcW?=
 =?us-ascii?Q?JD0OxrdjZ5Rlb0qKLgS7JZ3EoHAqekR8LhWSY6OyCHvI+5CyN8aSklkL+qz7?=
 =?us-ascii?Q?XSBs3ai9cPH7neYJb7GjuLYwmcBVXn4YD0OMAg4HMgp5RhEB129CbyB+Orkz?=
 =?us-ascii?Q?wpDH0mfrAPTsKL7RIY2QwFshOReQZ908vV9NCexn8x3gHl/2/979BVBNwnxm?=
 =?us-ascii?Q?vwVJhUoqvgWyprjWATVO3FkkP9RXLsL8P1Q1WsSb12NfJCs9Ci8xkVVoBn3q?=
 =?us-ascii?Q?i3lelA6LHS2EGdpXNX2qt/qwBIMWG3nyuM9kBu/xjPfm/7+PAKl1zm9fwLTC?=
 =?us-ascii?Q?2gVCWyYjeslkypSkqQSnifDDV85XpfvLmyadmTJonMdsw3fruhPbLPGYOerM?=
 =?us-ascii?Q?3MKp+4XZYHL44C7qBppFUE2De5zqLhzybOkKFcYmU2mRN+Ud2vKVsS6grlov?=
 =?us-ascii?Q?jPubJ60Tx9NYQjd29WWrxF81fUO6/JwgobtphXfiy8AygdvXmEsmaOzItowf?=
 =?us-ascii?Q?tEswGjUql+swkbmBxd5dxR/UO5x6+kzuMhlC394GZ2eVuqGgFbULyqBr6qag?=
 =?us-ascii?Q?sb88zvKxqTit3IMHQeYfSqfLF5uPP/xPo4IPowkC/AzV2inLGfl4SW4nEFlH?=
 =?us-ascii?Q?T3uHusClzKvXWvlaT3qccmkcbUbJjZgKND+3N8UUDfCpWQf8kHM6xaZ2XH5h?=
 =?us-ascii?Q?rA/IeSjWp3zJvo4arhTQluUifDV5Y9paNahu2zdZoihzNwj7F29JoxfMX11y?=
 =?us-ascii?Q?OWJwwqkqhH/jQwGzHaT+1vc8g70Rf7gqeXY6scKELNYyewV06YIN7l9qMI6e?=
 =?us-ascii?Q?gh1gpXHFI9bQ3swxx4O6gw7uNM8lXjgZOY9DCg4NdzdBvjwBwb+zTwy1Iq4N?=
 =?us-ascii?Q?WTbks2meW7X6li9XNw6U5o2BlFGXGKpJ7/SMWzAqxXL2E95nHg9uzZy7+Hda?=
 =?us-ascii?Q?eIAP1t4Da1eT53sXSo4AZVwOcKxK0JqY8J+BPb+hhtBZrrGydJ8A/eOe73S6?=
 =?us-ascii?Q?qfTXaHVl6KeF1uRaAy2aAmGNQrbD5nzoD6Zyj54eUNFqZ04oovq/TT3Xq7vG?=
 =?us-ascii?Q?TJHXHY0XQ6i183zRB49KlY+c7LVlWLtD2uZuNtvCohNrrUL1tEQrd1tnV+/t?=
 =?us-ascii?Q?YGHJZ/ar2pLa6iILg3K7SWCDl4wHEwbkLARqtfV8Y81+4T+ox7TbPHBpvYQE?=
 =?us-ascii?Q?CSQ9+SNTOLsbntMBXByin3xg6s/gfICGnj5Zsou0RjOogk0LChNuDZqGEWWZ?=
 =?us-ascii?Q?qL3B7fbvREDwGpmuV7ZcQdVdlJ3XOS5wVxhZG36z2BCQcS1/KUsK7EuLJkuA?=
 =?us-ascii?Q?jjWFZWibU+S6WqiokDfXAyK3X+2l6c+DlC8ZASXKtxGGSgJXwSb5IPNjf50L?=
 =?us-ascii?Q?75gXOamC6ledgZTlUyuxRI7Z2/V+aj6qLelLsZd2x3xMqv392kf8TNXtw45s?=
 =?us-ascii?Q?oXlCvRTju3m2YmwM/UtVszpKdubNUIOWe3g0xVWqHu4jrth4aSxueOlfkGCU?=
 =?us-ascii?Q?mkZ7DTZLBb0SNdHq6kCbBQs1OsKkGS1uE54s4zdfrlXeusbNfT5uIepQYKwc?=
 =?us-ascii?Q?vyyxRwruOB+yPeL/M53UGVS19H+BYIeC61FxElXQSqHtbZl3VZl8R3zD2wIh?=
 =?us-ascii?Q?PQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	/8LRxD4oIsLJwBx3RqsFLawrDtWiuz/batX0NFVAx3K4ADvhSzs2CzVO8kgd+g3eI1iTLp/MObOHPjaQZVDcv3dNMh4PosBs0aGiCM8/mz9jawuZEjPAebrM5z/5u2NhhLiStcvOlKhG0ofnRS0AHzm55B97PePZqNaWPokKQH+SNZZC2s0DNdXit5GpZxlwLmH3yZIplS4uklLK1CAwT/TPFuoU2x+KMTelQD4vQ9EduCAmZ9KqrBjSIaTAwRH+riuJL3DR61NFlDbH5e9ThcYU98zkWtipab/plieT+undawnOUxeb0M0ANhH/iSiSKrrbg0T6IsnOxkc4wsoVd0r+rqvKXkOqADfLT4c7xXzYL0/LD24b+KTwdBT1x9N4sqBSPy07tov5OtRjV7HQ81sZSPHfHlZuf1pd/WTQ2bq7GTgzkxK6Dj0ggA2GvmUT3eBoeEJF6tQuEz2m2tup5MRkij8BjYVEt2hbDJCVlTwKtRZocYkdtLG+F102ipzRlPMQH3gvcIUjNpUJmwFjqTz1t+vcUkuc+HVRVUGAxXZY2WXRBw5++KGUj5kwCv8zhNVn6VGW8NgVEJcdLWOZRC5oloFNxWVUBUfb/OjvuE4=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e64776bc-90ea-4583-32aa-08dc3d0f5198
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:18.3601
 (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: pdCZsxaf7lN3naFQh88WOKc8Dsf6MkjoPt8a7B6X7IVqmeG76MHpHG5SIQwNhaK2829jbWgTYxWn/BDp7/egxg==
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-GUID: DLiiPi_zdNVt4UyX5_Cjg7HAtaBuvdnQ
X-Proofpoint-ORIG-GUID: DLiiPi_zdNVt4UyX5_Cjg7HAtaBuvdnQ

Use standard template for scsi_host_template structure to reduce
duplication.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 drivers/scsi/isci/init.c | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index d0a23ce4afba..49e64232def1 100644
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -155,31 +155,11 @@ static const struct attribute_group *isci_sdev_groups[] = {
 };
 
 static const struct scsi_host_template isci_sht = {
-
-	.module				= THIS_MODULE,
-	.name				= DRV_NAME,
-	.proc_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			= isci_host_scan_finished,
 	.scan_start			= isci_host_start,
-	.change_queue_depth		= sas_change_queue_depth,
-	.bios_param			= sas_bios_param,
 	.can_queue			= ISCI_CAN_QUEUE_VAL,
-	.this_id			= -1,
 	.sg_tablesize			= SG_ALL,
-	.max_sectors			= SCSI_DEFAULT_MAX_SECTORS,
-	.eh_abort_handler		= sas_eh_abort_handler,
-	.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			= isci_host_groups,
 	.sdev_groups			= isci_sdev_groups,
 	.track_queue_depth		= 1,
-- 
2.31.1