iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI/AER: Reuse existing pcie_port_find_device() interface

Browse Source 
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>
This commit is contained in:
Keith Busch 2018-10-11 12:34:10 -06:00 committed by Bjorn Helgaas
parent 369fd7b00f
commit 0e98db259f
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/pci/pcie/aer_inject.c
View File

@ -303,32 +303,13 @@ out:
return 0; 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) static int aer_inject(struct aer_error_inj *einj)
{ {
struct aer_error *err, *rperr; struct aer_error *err, *rperr;
struct aer_error *err_alloc = NULL, *rperr_alloc = NULL; struct aer_error *err_alloc = NULL, *rperr_alloc = NULL;
struct pci_dev *dev, *rpdev; struct pci_dev *dev, *rpdev;
struct pcie_device *edev; struct pcie_device *edev;
struct device *device;
unsigned long flags; unsigned long flags;
unsigned int devfn = PCI_DEVFN(einj->dev, einj->fn); unsigned int devfn = PCI_DEVFN(einj->dev, einj->fn);
int pos_cap_err, rp_pos_cap_err; int pos_cap_err, rp_pos_cap_err;
@ -464,7 +445,9 @@ static int aer_inject(struct aer_error_inj *einj)
if (ret) if (ret)
goto out_put; 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)) { if (!get_service_data(edev)) {
dev_warn(&edev->device, dev_warn(&edev->device,
"aer_inject: AER service is not initialized\n"); "aer_inject: AER service is not initialized\n");

1
drivers/pci/pcie/portdrv_core.c
View File

@ -486,6 +486,7 @@ struct device *pcie_port_find_device(struct pci_dev *dev,
device = pdrvs.dev; device = pdrvs.dev;
return device; return device;
} }
EXPORT_SYMBOL_GPL(pcie_port_find_device);
/** /**
* pcie_port_device_remove - unregister PCI Express port service devices * pcie_port_device_remove - unregister PCI Express port service devices