Skip to content

Commit 2f4e20c

Browse files
johnpgarrymartinkpetersen
authored andcommitted
scsi: libsas: Delete enum sas_phy_type
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Damien Le Moal <[email protected]> Reviewed-by: Jason Yan <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent c46a917 commit 2f4e20c

File tree

6 files changed

+0
-11
lines changed

6 files changed

+0
-11
lines changed

drivers/scsi/aic94xx/aic94xx_hwi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ static int asd_init_phy(struct asd_phy *phy)
7474
sas_phy->enabled = 1;
7575
sas_phy->iproto = SAS_PROTOCOL_ALL;
7676
sas_phy->tproto = 0;
77-
sas_phy->type = PHY_TYPE_PHYSICAL;
7877
sas_phy->role = PHY_ROLE_INITIATOR;
7978
sas_phy->oob_mode = OOB_NOT_CONNECTED;
8079
sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN;

drivers/scsi/hisi_sas/hisi_sas_main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,6 @@ static void hisi_sas_phy_init(struct hisi_hba *hisi_hba, int phy_no)
10201020
sas_phy->enabled = (phy_no < hisi_hba->n_phy) ? 1 : 0;
10211021
sas_phy->iproto = SAS_PROTOCOL_ALL;
10221022
sas_phy->tproto = 0;
1023-
sas_phy->type = PHY_TYPE_PHYSICAL;
10241023
sas_phy->role = PHY_ROLE_INITIATOR;
10251024
sas_phy->oob_mode = OOB_NOT_CONNECTED;
10261025
sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN;

drivers/scsi/isci/phy.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1406,7 +1406,6 @@ void isci_phy_init(struct isci_phy *iphy, struct isci_host *ihost, int index)
14061406
iphy->sas_phy.enabled = 1;
14071407
iphy->sas_phy.iproto = SAS_PROTOCOL_ALL;
14081408
iphy->sas_phy.tproto = 0;
1409-
iphy->sas_phy.type = PHY_TYPE_PHYSICAL;
14101409
iphy->sas_phy.role = PHY_ROLE_INITIATOR;
14111410
iphy->sas_phy.oob_mode = OOB_NOT_CONNECTED;
14121411
iphy->sas_phy.linkrate = SAS_LINK_RATE_UNKNOWN;

drivers/scsi/mvsas/mv_init.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ static void mvs_phy_init(struct mvs_info *mvi, int phy_id)
8686
sas_phy->enabled = (phy_id < mvi->chip->n_phy) ? 1 : 0;
8787
sas_phy->iproto = SAS_PROTOCOL_ALL;
8888
sas_phy->tproto = 0;
89-
sas_phy->type = PHY_TYPE_PHYSICAL;
9089
sas_phy->role = PHY_ROLE_INITIATOR;
9190
sas_phy->oob_mode = OOB_NOT_CONNECTED;
9291
sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN;

drivers/scsi/pm8001/pm8001_init.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ static void pm8001_phy_init(struct pm8001_hba_info *pm8001_ha, int phy_id)
164164
sas_phy->enabled = (phy_id < pm8001_ha->chip->n_phy) ? 1 : 0;
165165
sas_phy->iproto = SAS_PROTOCOL_ALL;
166166
sas_phy->tproto = 0;
167-
sas_phy->type = PHY_TYPE_PHYSICAL;
168167
sas_phy->role = PHY_ROLE_INITIATOR;
169168
sas_phy->oob_mode = OOB_NOT_CONNECTED;
170169
sas_phy->linkrate = SAS_LINK_RATE_UNKNOWN;

include/scsi/libsas.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ enum sas_phy_role {
2929
PHY_ROLE_INITIATOR = 0x80,
3030
};
3131

32-
enum sas_phy_type {
33-
PHY_TYPE_PHYSICAL,
34-
PHY_TYPE_VIRTUAL
35-
};
36-
3732
/* The events are mnemonically described in sas_dump.c
3833
* so when updating/adding events here, please also
3934
* update the other file too.
@@ -316,7 +311,6 @@ struct asd_sas_phy {
316311
enum sas_protocol iproto;
317312
enum sas_protocol tproto;
318313

319-
enum sas_phy_type type;
320314
enum sas_phy_role role;
321315
enum sas_oob_mode oob_mode;
322316
enum sas_linkrate linkrate;

0 commit comments

Comments
 (0)