Commit 752430d1 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Bjorn Helgaas
Browse files

PCI: cpqphp: Use pci_bus_read_dev_vendor_id() to detect presence 

The intent of the first part in PCI_RefinedAccessConfig() is to read Vendor
ID register and detect presence of the device that way.

Remove PCI_RefinedAccessConfig() (which was not named very helpfully to
begin with) and replace the call with pci_bus_read_dev_vendor_id() + read
config because it makes the logic more obvious at the caller side.

Link: https://lore.kernel.org/r/20241022091140.3504-3-ilpo.jarvinen@linux.intel.com


Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent e2226dbc

drivers/pci/hotplug/cpqphp_pci.c

+6 −16
Original line number Diff line number Diff line
@@ -132,20 +132,6 @@ int cpqhp_unconfigure_device(struct pci_func *func) 
	return 0;

}



static int PCI_RefinedAccessConfig(struct pci_bus *bus, unsigned int devfn, u8 offset, u32 *value)

{

	u32 vendID = 0;

	int ret;



	ret = pci_bus_read_config_dword(bus, devfn, PCI_VENDOR_ID, &vendID);

	if (ret != PCIBIOS_SUCCESSFUL)

		return PCIBIOS_DEVICE_NOT_FOUND;

	if (PCI_POSSIBLE_ERROR(vendID))

		return PCIBIOS_DEVICE_NOT_FOUND;

	return pci_bus_read_config_dword(bus, devfn, offset, value);

}





/*

 * cpqhp_set_irq

 *
@@ -211,7 +197,9 @@ static int PCI_ScanBusForNonBridge(struct controller *ctrl, u8 bus_num, u8 *dev_ 


	for (tdevice = 0; tdevice < 0xFF; tdevice++) {

		/* Scan for access first */

		ret = PCI_RefinedAccessConfig(ctrl->pci_bus, tdevice, 0x08, &work);

		if (!pci_bus_read_dev_vendor_id(ctrl->pci_bus, tdevice, &work, 0))

			continue;

		ret = pci_bus_read_config_dword(ctrl->pci_bus, tdevice, 0x08, &work);

		if (ret)

			continue;

		dbg("Looking for nonbridge bus_num %d dev_num %d\n", bus_num, tdevice);
@@ -224,7 +212,9 @@ static int PCI_ScanBusForNonBridge(struct controller *ctrl, u8 bus_num, u8 *dev_ 
	}

	for (tdevice = 0; tdevice < 0xFF; tdevice++) {

		/* Scan for access first */

		ret = PCI_RefinedAccessConfig(ctrl->pci_bus, tdevice, 0x08, &work);

		if (!pci_bus_read_dev_vendor_id(ctrl->pci_bus, tdevice, &work, 0))

			continue;

		ret = pci_bus_read_config_dword(ctrl->pci_bus, tdevice, 0x08, &work);

		if (ret)

			continue;

		dbg("Looking for bridge bus_num %d dev_num %d\n", bus_num, tdevice);