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 [thread overview]
Message-ID: <20230814141022.36875-4-john.g.garry@oracle.com> (raw)
In-Reply-To: <20230814141022.36875-1-john.g.garry@oracle.com>
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
next prev parent reply other threads:[~2023-08-14 14:12 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-14 14:10 [PATCH 00/10] libsas: Some tidy-up John Garry
2023-08-14 14:10 ` [PATCH 01/10] scsi: libsas: Delete sas_ha_struct.lldd_module John Garry
2023-08-15 2:07 ` Damien Le Moal
2023-08-15 9:27 ` Jason Yan
2023-10-09 6:38 ` Hannes Reinecke
2023-08-14 14:10 ` [PATCH 02/10] scsi: libsas: Delete enum sas_class John Garry
2023-08-15 2:07 ` Damien Le Moal
2023-08-15 9:30 ` Jason Yan
2023-10-09 6:38 ` Hannes Reinecke
2023-08-14 14:10 ` John Garry [this message]
2023-08-15 2:08 ` [PATCH 03/10] scsi: libsas: Delete enum sas_phy_type Damien Le Moal
2023-08-15 9:30 ` Jason Yan
2023-10-09 6:39 ` Hannes Reinecke
2023-08-14 14:10 ` [PATCH 04/10] scsi: libsas: Delete struct scsi_core John Garry
2023-08-15 2:10 ` Damien Le Moal
2023-08-15 9:30 ` Jason Yan
2023-10-09 6:40 ` Hannes Reinecke
2023-08-14 14:10 ` [PATCH 05/10] scsi: libsas: Delete sas_ssp_task.retry_count John Garry
2023-08-15 2:10 ` Damien Le Moal
2023-08-15 9:31 ` Jason Yan
2023-10-09 6:41 ` Hannes Reinecke
2023-08-14 14:10 ` [PATCH 06/10] scsi: libsas: Delete sas_ssp_task.enable_first_burst John Garry
2023-08-15 2:11 ` Damien Le Moal
2023-08-15 9:34 ` Jason Yan
2023-10-09 6:42 ` Hannes Reinecke
2023-08-14 14:10 ` [PATCH 07/10] scsi: libsas: Delete sas_ssp_task.task_prio John Garry
2023-08-15 2:17 ` Damien Le Moal
2023-08-15 7:44 ` John Garry
2023-10-09 6:55 ` Hannes Reinecke
2023-10-24 10:07 ` John Garry
2023-10-24 10:08 ` Hannes Reinecke
2023-08-14 14:10 ` [PATCH 08/10] scsi: libsas: Delete sas_ata_task.set_affil_pol John Garry
2023-08-15 2:12 ` Damien Le Moal
2023-08-15 9:37 ` Jason Yan
2023-10-09 6:56 ` Hannes Reinecke
2023-08-14 14:10 ` [PATCH 09/10] scsi: libsas: Delete sas_ata_task.stp_affil_pol John Garry
2023-08-15 2:13 ` Damien Le Moal
2023-08-15 9:37 ` Jason Yan
2023-10-09 6:57 ` Hannes Reinecke
2023-08-14 14:10 ` [PATCH 10/10] scsi: libsas: Delete sas_ata_task.retry_count John Garry
2023-08-15 2:14 ` Damien Le Moal
2023-08-15 9:37 ` Jason Yan
2023-10-09 6:57 ` Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230814141022.36875-4-john.g.garry@oracle.com \
--to=john.g.garry@oracle.com \
--cc=artur.paszkiewicz@intel.com \
--cc=chenxiang66@hisilicon.com \
--cc=dlemoal@kernel.org \
--cc=jejb@linux.ibm.com \
--cc=jinpu.wang@cloud.ionos.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=yanaijie@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox