[RFC PATCH 2/9] pci: portdrv: Drop driver field for port type.

Jonathan Cameron
2024-05-29T16:42:07Z

Always set to PCIE_ANY_PORT so no information.
Drop PCIE_ANY_PORT definition as well as not used for anything else.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/pci/hotplug/pciehp_core.c | 1 -
drivers/pci/pci-driver.c | 4 ----
drivers/pci/pcie/aer.c | 1 -
drivers/pci/pcie/dpc.c | 1 -
drivers/pci/pcie/pme.c | 1 -
drivers/pci/pcie/portdrv.h | 4 ----
6 files changed, 12 deletions(-)

diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 8e8d88f0d501..be666771c6e3 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -337,7 +337,6 @@ static int pciehp_runtime_resume(struct pcie_device *dev)

static struct pcie_port_service_driver hpdriver_portdrv = {
.name = "pciehp",
- .port_type = PCIE_ANY_PORT,
.service = PCIE_PORT_SERVICE_HP,

.probe = pciehp_probe,
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index af2996d0d17f..cd84c0cb80a4 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -1702,10 +1702,6 @@ static int pcie_port_bus_match(struct device *dev, struct device_driver *drv)
if (driver->service != pciedev->service)
return 0;

- if (driver->port_type != PCIE_ANY_PORT &&
- driver->port_type != pci_pcie_type(pciedev->port))
- return 0;
-
return 1;
}

diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c
index 189b50e4bc8d..e07c5bf71372 100644
--- a/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@ -1557,7 +1557,6 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev)

static struct pcie_port_service_driver aerdriver = {
.name = "aer",
- .port_type = PCIE_ANY_PORT,
.service = PCIE_PORT_SERVICE_AER,

.probe = aer_probe,
diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c
index a668820696dc..130e00bfd1e1 100644
--- a/drivers/pci/pcie/dpc.c
+++ b/drivers/pci/pcie/dpc.c
@@ -462,7 +462,6 @@ static void dpc_remove(struct pcie_device *dev)

static struct pcie_port_service_driver dpcdriver = {
.name = "dpc",
- .port_type = PCIE_ANY_PORT,
.service = PCIE_PORT_SERVICE_DPC,
.probe = dpc_probe,
.remove = dpc_remove,
diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c
index 2e23f131ed3e..dc6b1f5fbe48 100644
--- a/drivers/pci/pcie/pme.c
+++ b/drivers/pci/pcie/pme.c
@@ -456,7 +456,6 @@ static void pcie_pme_remove(struct pcie_device *srv)

static struct pcie_port_service_driver pcie_pme_driver = {
.name = "pcie_pme",
- .port_type = PCIE_ANY_PORT,
.service = PCIE_PORT_SERVICE_PME,

.probe = pcie_pme_probe,
diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
index 344b796a8579..ea320fb026e6 100644
--- a/drivers/pci/pcie/portdrv.h
+++ b/drivers/pci/pcie/portdrv.h
@@ -51,9 +51,6 @@ int pcie_dpc_init(void);
static inline int pcie_dpc_init(void) { return 0; }
#endif

-/* Port Type */
-#define PCIE_ANY_PORT (~0)
-
struct pcie_device {
int irq; /* Service IRQ/MSI/MSI-X Vector */
struct pci_dev *port; /* Root/Upstream/Downstream Port */
@@ -74,7 +71,6 @@ struct pcie_port_service_driver {

int (*slot_reset)(struct pcie_device *dev);

- int port_type; /* Type of the port this driver can handle */
u32 service; /* Port service this device represents */

struct device_driver driver;
--
2.39.2