Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   John Garry <john.g.garry@oracle.com>
To:     jejb@linux.ibm.com, martin.petersen@oracle.com,
        chenxiang66@hisilicon.com, artur.paszkiewicz@intel.com,
        yanaijie@huawei.com, jinpu.wang@cloud.ionos.com
Cc:     linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        dlemoal@kernel.org, John Garry <john.g.garry@oracle.com>
Subject: [PATCH 03/10] scsi: libsas: Delete enum sas_phy_type
Date:   Mon, 14 Aug 2023 14:10:15 +0000
Message-Id: <20230814141022.36875-4-john.g.garry@oracle.com>
In-Reply-To: <20230814141022.36875-1-john.g.garry@oracle.com>
References: <20230814141022.36875-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RGFa3pq9ws/DJ0hTrnp20HqoG8/bOfqJp5CT9uGl19S2LcQf8vOPoivRJwDT?=
 =?us-ascii?Q?WPhPNyIqk9WeH8zJwE4/xAvKUY47vj2mN2K3K3sQZXKr8UeKXsUOBiEOkiaF?=
 =?us-ascii?Q?XyzMGlFHl+2PNT5uBk7PBfSIgtxF0mF8wVB+M5pQmUveINywXkXjlEfCBMA7?=
 =?us-ascii?Q?AfN3x1iUCYbGf9g3mrXLL+0uHgwOBnR1ZSeXylmYW9v4bHNSliVENA+I7IaV?=
 =?us-ascii?Q?ahflh4WDxt9IcMnXQs5k1FCgtBVidkO2r7cS5OUqbBXa4cGfAiaD2uleTJcV?=
 =?us-ascii?Q?Njkog+CBJVPuMUChqEN03qlQHcucJ4HReWlYoHOQ3bGYOw/ar5UjnkhwsFGw?=
 =?us-ascii?Q?0WCqwV18/5XyDZWo5cUZWfHLEoN0Eu5E1E6gq5Q9q7W4FjeL2cPGlsHZH4DV?=
 =?us-ascii?Q?16aCCNSjFgewz/0Llz7fvc7XYWfg+VA0fMeWp5WORe9G7HwqvHjIck3YXT8K?=
 =?us-ascii?Q?4elwrPSbc5Vz8iOxZwnucEJ3j9P6yF+cd5rk0CvAI3UOUMG9mzdOktpMMWXQ?=
 =?us-ascii?Q?dcbUWgAhxp4FwYyi4Q0Xu7OrDSYBNhF2GnFNVB1CLiVxm/2xKt9wSO434qxU?=
 =?us-ascii?Q?FwTgHVO4V51bHx8iTlhE66oL+ZFqLTJHfUtKC3ONEDYTUNo9DsniZLlRLyrh?=
 =?us-ascii?Q?BpP1q0L63+enaYEC8XMrnpU33dqhnrxYmA2zHhg7wJDB624aPPmCRGIIUTMV?=
 =?us-ascii?Q?7hXZDfa1Zjo+B1ZUcnHJeVML0CyfskzbrLmxR1d3f2AOSVIRDzbvQgT8TU6K?=
 =?us-ascii?Q?3j8szqk6pbBIksBNKPlOf4uqCREbf2bAOdrJrSLUJ9q/eHiAVK32rXDoAkr4?=
 =?us-ascii?Q?XoZQgKCRZAEy6nkyyXnwyeugV1NjtZceYeYNqESO1dkQUt7dzSYqAS+/boht?=
 =?us-ascii?Q?Wt3+I/91AOTMPah75BQkrIj9QqgUI2yaoSlZN4H0RlXAU8/j5LsTlVV9+l7O?=
 =?us-ascii?Q?8dg0ndQKI4ePM9Yv1Pwtjf8pnEslJIoKZXKAF0JGD+y9AQaJiJgIc8GsH4D3?=
 =?us-ascii?Q?WdzH9/4Avwn4oCfT1y6lc6txsHOkKh5JRhCJqfuO5SFO5FdsfQdkW1SeINDJ?=
 =?us-ascii?Q?n2A2xIqbCiuzncQ2D3XupjSP6oty3IJ+09cDbxTwHeTjBnm1zyVos3xZvKdF?=
 =?us-ascii?Q?g40ySPv7GYU8EE8LvLkISNNEJs1F7Se9QhfgApR3FgP/MBL97vtY5S0OJP8q?=
 =?us-ascii?Q?aOS7JHWxPy659JIv2wFbn/hJ0IpJ1TQK+IS8ofmRJUTaZautHbr5b1/bSctb?=
 =?us-ascii?Q?nGmzJ+ZeGVQIpt+4zKT7WCepMXtf6UcHJQAffHpwkB0peWnwmEIfUOkf1Te6?=
 =?us-ascii?Q?Wj4Ug4sOxaUwwkuf8yylk0DyZP1d/3XvLJIu/sc0c9UCmdT3LprqOnX2wa4q?=
 =?us-ascii?Q?WoKAKbXnBuEoIbvoq24EGma/8Fcag+iqVBBO1jmBDZGClwi9cDcYYkGvRuXI?=
 =?us-ascii?Q?JoU+2BA2CEWIqqvobX0itZ09JPMWO6AHYuidBwsJL+5+hA87VHGFLZ3gr/co?=
 =?us-ascii?Q?B/WrOtnXnho7RSFPiXZ+bVKJCEUJCq0vqupaglu1A93GVJCTcAlJqnpWQUIn?=
 =?us-ascii?Q?cCuFg8IK9KfncJJMfT9CHc5KWNZ5f5Ja1ZQHW+kmm8xawLs1JeP4Sbv1xmD3?=
 =?us-ascii?Q?3w=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?gFFJO2vF3XL9GuCzKtAos1A9K/1YUmoa0Fyp4PVgUZbuy/cFORsRVPhw2otH?=
 =?us-ascii?Q?AUGFffI5uCMIdljxd1GCO3jZBOW8hPYTxivDlQPPdKn687toGb89180V8XZk?=
 =?us-ascii?Q?RkfBM6Nm8YyCDQGr8IyTMnXDpG0iMuUnaMroQ2Ia8h7g5g5wfbRqFqp84ouo?=
 =?us-ascii?Q?TUCcauduyy+OzJAgIvslGQceEiWAqVA6/4anhE9Px6BlxYogZ4UeIJaT5RHp?=
 =?us-ascii?Q?q2Q4A611VZnAD0NlXpv8nq22Zn3vroalAAuIked7FzYwi8nyfZEJ4Ej5QQLb?=
 =?us-ascii?Q?FcslghXW8KLrPuCw4KZn2vEdkVMy4g73fcZes/xQF7Fmyvd1JOZRygy36UQA?=
 =?us-ascii?Q?4l4DbsIu6dr9GX+nswQZRmb1LIYwBo5Tfe4WeUwkncisa0HLSLyi59kaBB6Q?=
 =?us-ascii?Q?xl219BOpjAmohomhFJE2nlQvrnZllFhkFZnpPhXBqAdC8/IO6wQjC9IliHH7?=
 =?us-ascii?Q?uHXm0D/rjHKUZKzGVtcPrf9hbqiOH9GiX6Vlnhr7VNPIvdQbhgzGJi3RxLtE?=
 =?us-ascii?Q?htte1XEtMd2thKKKNDClHFrwMcydakntMdSsJlJ7/X8sBR5+yyAJCYpHSC6z?=
 =?us-ascii?Q?s27lsmD8sJDn30/rWdPuHWRbBGlLZmz3NX5roGbkwSCrT6dGRJuhH31PVubj?=
 =?us-ascii?Q?NI0iEfNd6h0T95S3cUyqJuVK9CXLel7YTW24Lt75XachfOd8cS8W17fNowU/?=
 =?us-ascii?Q?GR2og+6yLsMsnP05gOIYwKT1VyeacEgNbklZQUfD1KFAqjrOrcKa5XO5Ls/J?=
 =?us-ascii?Q?+cooDIJG7G4rBR00g+Xexf7c/p61vwlHE1QFMvH5lvXcVluQ5nYEt5nvfI3I?=
 =?us-ascii?Q?RStBm025j+sfcYTHtMRE4iHqtcZQecTa8F6P+zum0+Lq44noHFcgNBDKicqT?=
 =?us-ascii?Q?Iftkv0daYOjF3r8ViGr1VrONWQF+1/M9i+DGIcFpgTsxTq5hyvWLlw2rzVQA?=
 =?us-ascii?Q?1As7VyN8Fzq5chPXWXelIA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 39587792-7c4a-4002-fde6-08db9cd04408
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2023 14:10:51.2735
 (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: J5TDtilFnYWH7pJhzAdMLfUznF0i8n5GqPY84rLy5jqsIwl8hGOtR+TX7PtVaWwFhIKAixjSjPu6jwrruIA2mg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB5629
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26
 definitions=2023-08-14_10,2023-08-10_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 mlxscore=0
 spamscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000
 definitions=main-2308140131
X-Proofpoint-ORIG-GUID: Qb71WqwpJLoVFnUzKIamqMw8GpYdyrrR
X-Proofpoint-GUID: Qb71WqwpJLoVFnUzKIamqMw8GpYdyrrR
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

enum sas_phy_type is used for asd_sas_phy.type, which is only ever set,
so delete this member and the enum.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 drivers/scsi/aic94xx/aic94xx_hwi.c    | 1 -
 drivers/scsi/hisi_sas/hisi_sas_main.c | 1 -
 drivers/scsi/isci/phy.c               | 1 -
 drivers/scsi/mvsas/mv_init.c          | 1 -
 drivers/scsi/pm8001/pm8001_init.c     | 1 -
 include/scsi/libsas.h                 | 6 ------
 6 files changed, 11 deletions(-)

diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.c b/drivers/scsi/aic94xx/aic94xx_hwi.c
index d8f56e528877..75848de13818 100644
--- a/drivers/scsi/aic94xx/aic94xx_hwi.c
+++ b/drivers/scsi/aic94xx/aic94xx_hwi.c
@@ -74,7 +74,6 @@ static int asd_init_phy(struct asd_phy *phy)
 	sas_phy->enabled = 1;
 	sas_phy->iproto = SAS_PROTOCOL_ALL;
 	sas_phy->tproto = 0;
-	sas_phy->type = PHY_TYPE_PHYSICAL;
 	sas_phy->role = PHY_ROLE_INITIATOR;
 	sas_phy->oob_mode = OOB_NOT_CONNECTED;
 	sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN;
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 1172065c1d7d..72dd5e3ad9da 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -1020,7 +1020,6 @@ static void hisi_sas_phy_init(struct hisi_hba *hisi_hba, int phy_no)
 	sas_phy->enabled = (phy_no < hisi_hba->n_phy) ? 1 : 0;
 	sas_phy->iproto = SAS_PROTOCOL_ALL;
 	sas_phy->tproto = 0;
-	sas_phy->type = PHY_TYPE_PHYSICAL;
 	sas_phy->role = PHY_ROLE_INITIATOR;
 	sas_phy->oob_mode = OOB_NOT_CONNECTED;
 	sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN;
diff --git a/drivers/scsi/isci/phy.c b/drivers/scsi/isci/phy.c
index ea2e339f5b1a..743a3c64b0da 100644
--- a/drivers/scsi/isci/phy.c
+++ b/drivers/scsi/isci/phy.c
@@ -1406,7 +1406,6 @@ void isci_phy_init(struct isci_phy *iphy, struct isci_host *ihost, int index)
 	iphy->sas_phy.enabled = 1;
 	iphy->sas_phy.iproto = SAS_PROTOCOL_ALL;
 	iphy->sas_phy.tproto = 0;
-	iphy->sas_phy.type = PHY_TYPE_PHYSICAL;
 	iphy->sas_phy.role = PHY_ROLE_INITIATOR;
 	iphy->sas_phy.oob_mode = OOB_NOT_CONNECTED;
 	iphy->sas_phy.linkrate = SAS_LINK_RATE_UNKNOWN;
diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index 408113bf506d..d5cf563e9094 100644
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -86,7 +86,6 @@ static void mvs_phy_init(struct mvs_info *mvi, int phy_id)
 	sas_phy->enabled = (phy_id < mvi->chip->n_phy) ? 1 : 0;
 	sas_phy->iproto = SAS_PROTOCOL_ALL;
 	sas_phy->tproto = 0;
-	sas_phy->type = PHY_TYPE_PHYSICAL;
 	sas_phy->role = PHY_ROLE_INITIATOR;
 	sas_phy->oob_mode = OOB_NOT_CONNECTED;
 	sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN;
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index e5d794a97b14..0ffde0bcd737 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -164,7 +164,6 @@ static void pm8001_phy_init(struct pm8001_hba_info *pm8001_ha, int phy_id)
 	sas_phy->enabled = (phy_id < pm8001_ha->chip->n_phy) ? 1 : 0;
 	sas_phy->iproto = SAS_PROTOCOL_ALL;
 	sas_phy->tproto = 0;
-	sas_phy->type = PHY_TYPE_PHYSICAL;
 	sas_phy->role = PHY_ROLE_INITIATOR;
 	sas_phy->oob_mode = OOB_NOT_CONNECTED;
 	sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN;
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 3048660ff107..e54bcdc1ecd1 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -29,11 +29,6 @@ enum sas_phy_role {
 	PHY_ROLE_INITIATOR = 0x80,
 };
 
-enum sas_phy_type {
-	PHY_TYPE_PHYSICAL,
-	PHY_TYPE_VIRTUAL
-};
-
 /* The events are mnemonically described in sas_dump.c
  * so when updating/adding events here, please also
  * update the other file too.
@@ -316,7 +311,6 @@ struct asd_sas_phy {
 	enum sas_protocol iproto;
 	enum sas_protocol tproto;
 
-	enum sas_phy_type  type;
 	enum sas_phy_role  role;
 	enum sas_oob_mode  oob_mode;
 	enum sas_linkrate linkrate;
-- 
2.35.3