PCI/portdrv: Remove unused resume err_handler

Commit 3e41a317ae45 ("PCI/AER: Remove unused aer_error_resume()")
removed the resume err_handler from AER.  Since no other port service
implements the callback, support for it can be removed from portdrv.
It can be revived later if need be, preferably by re-using the
pcie_port_device_iter() iterator.

Link: https://lore.kernel.org/r/25334149b604e005058aeb0fdf51e01f991d5d74.1627638184.git.lukas@wunner.de
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h
index 41fe1ffd590782c07d24f5feab01d65c6f9edecb..e9fe0fef6cdec56d84db82ba830778e53cac9848 100644 (file)
--- a/drivers/pci/pcie/portdrv.h
+++ b/drivers/pci/pcie/portdrv.h
@@ -87,9 +87,6 @@ struct pcie_port_service_driver {
 
        int (*slot_reset)(struct pcie_device *dev);
 
-       /* Device driver may resume normal operations */
-       void (*error_resume)(struct pci_dev *dev);
-
        int port_type;  /* Type of the port this driver can handle */
        u32 service;    /* Port service this device represents */
 

diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 1af74c3d9d5db67d7008a1696695ea82dc7ee09d..35eca6277a96ebf63f639a2427b0fa0f25c139be 100644 (file)
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -173,29 +173,6 @@ static pci_ers_result_t pcie_portdrv_mmio_enabled(struct pci_dev *dev)
        return PCI_ERS_RESULT_RECOVERED;
 }
 
-static int resume_iter(struct device *device, void *data)
-{
-       struct pcie_device *pcie_device;
-       struct pcie_port_service_driver *driver;
-
-       if (device->bus == &pcie_port_bus_type && device->driver) {
-               driver = to_service_driver(device->driver);
-               if (driver && driver->error_resume) {
-                       pcie_device = to_pcie_device(device);
-
-                       /* Forward error message to service drivers */
-                       driver->error_resume(pcie_device->port);
-               }
-       }
-
-       return 0;
-}
-
-static void pcie_portdrv_err_resume(struct pci_dev *dev)
-{
-       device_for_each_child(&dev->dev, NULL, resume_iter);
-}
-
 /*
  * LINUX Device Driver Model
  */
@@ -213,7 +190,6 @@ static const struct pci_error_handlers pcie_portdrv_err_handler = {
        .error_detected = pcie_portdrv_error_detected,
        .slot_reset = pcie_portdrv_slot_reset,
        .mmio_enabled = pcie_portdrv_mmio_enabled,
-       .resume = pcie_portdrv_err_resume,
 };
 
 static struct pci_driver pcie_portdriver = {