Commit c46a9170 authored by John Garry's avatar John Garry Committed by Martin K. Petersen

scsi: libsas: Delete enum sas_class

enum sas_class prob would have been useful if function sas_show_class() was
ever implemented, which it wasn't.

enum sas_class is used as asd_sas_port.class and asd_sas_phy.class, which
are only ever set, so delete these members and the enum.
Signed-off-by: default avatarJohn Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20230815115156.343535-3-john.g.garry@oracle.comReviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b1bc4973
...@@ -72,7 +72,6 @@ static int asd_init_phy(struct asd_phy *phy) ...@@ -72,7 +72,6 @@ static int asd_init_phy(struct asd_phy *phy)
struct asd_sas_phy *sas_phy = &phy->sas_phy; struct asd_sas_phy *sas_phy = &phy->sas_phy;
sas_phy->enabled = 1; sas_phy->enabled = 1;
sas_phy->class = SAS;
sas_phy->iproto = SAS_PROTOCOL_ALL; sas_phy->iproto = SAS_PROTOCOL_ALL;
sas_phy->tproto = 0; sas_phy->tproto = 0;
sas_phy->type = PHY_TYPE_PHYSICAL; sas_phy->type = PHY_TYPE_PHYSICAL;
......
...@@ -1018,7 +1018,6 @@ static void hisi_sas_phy_init(struct hisi_hba *hisi_hba, int phy_no) ...@@ -1018,7 +1018,6 @@ static void hisi_sas_phy_init(struct hisi_hba *hisi_hba, int phy_no)
phy->minimum_linkrate = SAS_LINK_RATE_1_5_GBPS; phy->minimum_linkrate = SAS_LINK_RATE_1_5_GBPS;
phy->maximum_linkrate = hisi_hba->hw->phy_get_max_linkrate(); phy->maximum_linkrate = hisi_hba->hw->phy_get_max_linkrate();
sas_phy->enabled = (phy_no < hisi_hba->n_phy) ? 1 : 0; sas_phy->enabled = (phy_no < hisi_hba->n_phy) ? 1 : 0;
sas_phy->class = SAS;
sas_phy->iproto = SAS_PROTOCOL_ALL; sas_phy->iproto = SAS_PROTOCOL_ALL;
sas_phy->tproto = 0; sas_phy->tproto = 0;
sas_phy->type = PHY_TYPE_PHYSICAL; sas_phy->type = PHY_TYPE_PHYSICAL;
......
...@@ -1404,7 +1404,6 @@ void isci_phy_init(struct isci_phy *iphy, struct isci_host *ihost, int index) ...@@ -1404,7 +1404,6 @@ void isci_phy_init(struct isci_phy *iphy, struct isci_host *ihost, int index)
iphy->sas_phy.ha = &ihost->sas_ha; iphy->sas_phy.ha = &ihost->sas_ha;
iphy->sas_phy.lldd_phy = iphy; iphy->sas_phy.lldd_phy = iphy;
iphy->sas_phy.enabled = 1; iphy->sas_phy.enabled = 1;
iphy->sas_phy.class = SAS;
iphy->sas_phy.iproto = SAS_PROTOCOL_ALL; iphy->sas_phy.iproto = SAS_PROTOCOL_ALL;
iphy->sas_phy.tproto = 0; iphy->sas_phy.tproto = 0;
iphy->sas_phy.type = PHY_TYPE_PHYSICAL; iphy->sas_phy.type = PHY_TYPE_PHYSICAL;
......
...@@ -41,7 +41,6 @@ struct sas_phy_data { ...@@ -41,7 +41,6 @@ struct sas_phy_data {
void sas_scsi_recover_host(struct Scsi_Host *shost); void sas_scsi_recover_host(struct Scsi_Host *shost);
int sas_show_class(enum sas_class class, char *buf);
int sas_show_proto(enum sas_protocol proto, char *buf); int sas_show_proto(enum sas_protocol proto, char *buf);
int sas_show_linkrate(enum sas_linkrate linkrate, char *buf); int sas_show_linkrate(enum sas_linkrate linkrate, char *buf);
int sas_show_oob_mode(enum sas_oob_mode oob_mode, char *buf); int sas_show_oob_mode(enum sas_oob_mode oob_mode, char *buf);
......
...@@ -83,7 +83,6 @@ static void sas_form_port_add_phy(struct asd_sas_port *port, ...@@ -83,7 +83,6 @@ static void sas_form_port_add_phy(struct asd_sas_port *port,
memcpy(port->sas_addr, phy->sas_addr, SAS_ADDR_SIZE); memcpy(port->sas_addr, phy->sas_addr, SAS_ADDR_SIZE);
if (*(u64 *)port->attached_sas_addr == 0) { if (*(u64 *)port->attached_sas_addr == 0) {
port->class = phy->class;
memcpy(port->attached_sas_addr, phy->attached_sas_addr, memcpy(port->attached_sas_addr, phy->attached_sas_addr,
SAS_ADDR_SIZE); SAS_ADDR_SIZE);
port->iproto = phy->iproto; port->iproto = phy->iproto;
...@@ -249,7 +248,6 @@ void sas_deform_port(struct asd_sas_phy *phy, int gone) ...@@ -249,7 +248,6 @@ void sas_deform_port(struct asd_sas_phy *phy, int gone)
INIT_LIST_HEAD(&port->phy_list); INIT_LIST_HEAD(&port->phy_list);
memset(port->sas_addr, 0, SAS_ADDR_SIZE); memset(port->sas_addr, 0, SAS_ADDR_SIZE);
memset(port->attached_sas_addr, 0, SAS_ADDR_SIZE); memset(port->attached_sas_addr, 0, SAS_ADDR_SIZE);
port->class = 0;
port->iproto = 0; port->iproto = 0;
port->tproto = 0; port->tproto = 0;
port->oob_mode = 0; port->oob_mode = 0;
......
...@@ -84,7 +84,6 @@ static void mvs_phy_init(struct mvs_info *mvi, int phy_id) ...@@ -84,7 +84,6 @@ static void mvs_phy_init(struct mvs_info *mvi, int phy_id)
phy->port = NULL; phy->port = NULL;
timer_setup(&phy->timer, NULL, 0); timer_setup(&phy->timer, NULL, 0);
sas_phy->enabled = (phy_id < mvi->chip->n_phy) ? 1 : 0; sas_phy->enabled = (phy_id < mvi->chip->n_phy) ? 1 : 0;
sas_phy->class = SAS;
sas_phy->iproto = SAS_PROTOCOL_ALL; sas_phy->iproto = SAS_PROTOCOL_ALL;
sas_phy->tproto = 0; sas_phy->tproto = 0;
sas_phy->type = PHY_TYPE_PHYSICAL; sas_phy->type = PHY_TYPE_PHYSICAL;
......
...@@ -162,7 +162,6 @@ static void pm8001_phy_init(struct pm8001_hba_info *pm8001_ha, int phy_id) ...@@ -162,7 +162,6 @@ static void pm8001_phy_init(struct pm8001_hba_info *pm8001_ha, int phy_id)
phy->minimum_linkrate = SAS_LINK_RATE_1_5_GBPS; phy->minimum_linkrate = SAS_LINK_RATE_1_5_GBPS;
phy->maximum_linkrate = SAS_LINK_RATE_6_0_GBPS; phy->maximum_linkrate = SAS_LINK_RATE_6_0_GBPS;
sas_phy->enabled = (phy_id < pm8001_ha->chip->n_phy) ? 1 : 0; sas_phy->enabled = (phy_id < pm8001_ha->chip->n_phy) ? 1 : 0;
sas_phy->class = SAS;
sas_phy->iproto = SAS_PROTOCOL_ALL; sas_phy->iproto = SAS_PROTOCOL_ALL;
sas_phy->tproto = 0; sas_phy->tproto = 0;
sas_phy->type = PHY_TYPE_PHYSICAL; sas_phy->type = PHY_TYPE_PHYSICAL;
......
...@@ -23,11 +23,6 @@ ...@@ -23,11 +23,6 @@
struct block_device; struct block_device;
enum sas_class {
SAS,
EXPANDER
};
enum sas_phy_role { enum sas_phy_role {
PHY_ROLE_NONE = 0, PHY_ROLE_NONE = 0,
PHY_ROLE_TARGET = 0x40, PHY_ROLE_TARGET = 0x40,
...@@ -258,7 +253,6 @@ struct asd_sas_port { ...@@ -258,7 +253,6 @@ struct asd_sas_port {
/* public: */ /* public: */
int id; int id;
enum sas_class class;
u8 sas_addr[SAS_ADDR_SIZE]; u8 sas_addr[SAS_ADDR_SIZE];
u8 attached_sas_addr[SAS_ADDR_SIZE]; u8 attached_sas_addr[SAS_ADDR_SIZE];
enum sas_protocol iproto; enum sas_protocol iproto;
...@@ -319,7 +313,6 @@ struct asd_sas_phy { ...@@ -319,7 +313,6 @@ struct asd_sas_phy {
int enabled; /* must be set */ int enabled; /* must be set */
int id; /* must be set */ int id; /* must be set */
enum sas_class class;
enum sas_protocol iproto; enum sas_protocol iproto;
enum sas_protocol tproto; enum sas_protocol tproto;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment