PCI/AER: Reuse existing pcie_port_find_device() interface

The port services driver already provides a method to find the pcie_device
for a service.  Export that function, use it from the aer_inject module,
and remove the duplicate functionality.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/pcie/aer_inject.c b/drivers/pci/pcie/aer_inject.c
index 0eb24346cad3057f964d75b7045524bc792df6f3..f40ed5867c89ed4222508e6ab3ec00ecaadb11b8 100644 (file)
--- a/drivers/pci/pcie/aer_inject.c
+++ b/drivers/pci/pcie/aer_inject.c
@@ -303,32 +303,13 @@ out:
        return 0;
 }
 
-static int find_aer_device_iter(struct device *device, void *data)
-{
-       struct pcie_device **result = data;
-       struct pcie_device *pcie_dev;
-
-       if (device->bus == &pcie_port_bus_type) {
-               pcie_dev = to_pcie_device(device);
-               if (pcie_dev->service & PCIE_PORT_SERVICE_AER) {
-                       *result = pcie_dev;
-                       return 1;
-               }
-       }
-       return 0;
-}
-
-static int find_aer_device(struct pci_dev *dev, struct pcie_device **result)
-{
-       return device_for_each_child(&dev->dev, result, find_aer_device_iter);
-}
-
 static int aer_inject(struct aer_error_inj *einj)
 {
        struct aer_error *err, *rperr;
        struct aer_error *err_alloc = NULL, *rperr_alloc = NULL;
        struct pci_dev *dev, *rpdev;
        struct pcie_device *edev;
+       struct device *device;
        unsigned long flags;
        unsigned int devfn = PCI_DEVFN(einj->dev, einj->fn);
        int pos_cap_err, rp_pos_cap_err;
@@ -464,7 +445,9 @@ static int aer_inject(struct aer_error_inj *einj)
        if (ret)
                goto out_put;
 
-       if (find_aer_device(rpdev, &edev)) {
+       device = pcie_port_find_device(rpdev, PCIE_PORT_SERVICE_AER);
+       if (device) {
+               edev = to_pcie_device(device);
                if (!get_service_data(edev)) {
                        dev_warn(&edev->device,
                                 "aer_inject: AER service is not initialized\n");

diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 6542c48c7f593567c511d9783631c1d85b65e8d9..f458ac9cb70c397868a17fa48027ccb21f80e762 100644 (file)
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -486,6 +486,7 @@ struct device *pcie_port_find_device(struct pci_dev *dev,
        device = pdrvs.dev;
        return device;
 }
+EXPORT_SYMBOL_GPL(pcie_port_find_device);
 
 /**
  * pcie_port_device_remove - unregister PCI Express port service devices