Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

authored by

Ilpo Järvinen and committed by
Bjorn Helgaas
752430d1 e2226dbc

+6 -16
+6 -16
drivers/pci/hotplug/cpqphp_pci.c
··· 132 132 return 0; 133 133 } 134 134 135 - static int PCI_RefinedAccessConfig(struct pci_bus *bus, unsigned int devfn, u8 offset, u32 *value) 136 - { 137 - u32 vendID = 0; 138 - int ret; 139 - 140 - ret = pci_bus_read_config_dword(bus, devfn, PCI_VENDOR_ID, &vendID); 141 - if (ret != PCIBIOS_SUCCESSFUL) 142 - return PCIBIOS_DEVICE_NOT_FOUND; 143 - if (PCI_POSSIBLE_ERROR(vendID)) 144 - return PCIBIOS_DEVICE_NOT_FOUND; 145 - return pci_bus_read_config_dword(bus, devfn, offset, value); 146 - } 147 - 148 - 149 135 /* 150 136 * cpqhp_set_irq 151 137 * ··· 197 211 198 212 for (tdevice = 0; tdevice < 0xFF; tdevice++) { 199 213 /* Scan for access first */ 200 - ret = PCI_RefinedAccessConfig(ctrl->pci_bus, tdevice, 0x08, &work); 214 + if (!pci_bus_read_dev_vendor_id(ctrl->pci_bus, tdevice, &work, 0)) 215 + continue; 216 + ret = pci_bus_read_config_dword(ctrl->pci_bus, tdevice, 0x08, &work); 201 217 if (ret) 202 218 continue; 203 219 dbg("Looking for nonbridge bus_num %d dev_num %d\n", bus_num, tdevice); ··· 212 224 } 213 225 for (tdevice = 0; tdevice < 0xFF; tdevice++) { 214 226 /* Scan for access first */ 215 - ret = PCI_RefinedAccessConfig(ctrl->pci_bus, tdevice, 0x08, &work); 227 + if (!pci_bus_read_dev_vendor_id(ctrl->pci_bus, tdevice, &work, 0)) 228 + continue; 229 + ret = pci_bus_read_config_dword(ctrl->pci_bus, tdevice, 0x08, &work); 216 230 if (ret) 217 231 continue; 218 232 dbg("Looking for bridge bus_num %d dev_num %d\n", bus_num, tdevice);