PCI: cpqphp: Fix PCIBIOS_* return value confusion

Code in and related to PCI_RefinedAccessConfig() has three types of return
type confusion:

 - PCI_RefinedAccessConfig() tests pci_bus_read_config_dword() return value
   against -1.

 - PCI_RefinedAccessConfig() returns both -1 and PCIBIOS_* return codes.

 - Callers of PCI_RefinedAccessConfig() only test for -1.

Make PCI_RefinedAccessConfig() return PCIBIOS_* codes consistently and
adapt callers accordingly.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Link: https://lore.kernel.org/r/20241022091140.3504-2-ilpo.jarvinen@linux.intel.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c
index 718bc6cf12cb3cb93603fa4845160738e59bc07b..974c7db3265b5a37e6de3aa699b7a3a58bb94e31 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_pci.c
+++ b/drivers/pci/hotplug/cpqphp_pci.c
@@ -135,11 +135,13 @@ int cpqhp_unconfigure_device(struct pci_func *func)
 static int PCI_RefinedAccessConfig(struct pci_bus *bus, unsigned int devfn, u8 offset, u32 *value)
 {
        u32 vendID = 0;
+       int ret;
 
-       if (pci_bus_read_config_dword(bus, devfn, PCI_VENDOR_ID, &vendID) == -1)
-               return -1;
+       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 -1;
+               return PCIBIOS_DEVICE_NOT_FOUND;
        return pci_bus_read_config_dword(bus, devfn, offset, value);
 }
 
@@ -202,13 +204,15 @@ static int PCI_ScanBusForNonBridge(struct controller *ctrl, u8 bus_num, u8 *dev_
 {
        u16 tdevice;
        u32 work;
+       int ret;
        u8 tbus;
 
        ctrl->pci_bus->number = bus_num;
 
        for (tdevice = 0; tdevice < 0xFF; tdevice++) {
                /* Scan for access first */
-               if (PCI_RefinedAccessConfig(ctrl->pci_bus, tdevice, 0x08, &work) == -1)
+               ret = PCI_RefinedAccessConfig(ctrl->pci_bus, tdevice, 0x08, &work);
+               if (ret)
                        continue;
                dbg("Looking for nonbridge bus_num %d dev_num %d\n", bus_num, tdevice);
                /* Yep we got one. Not a bridge ? */
@@ -220,7 +224,8 @@ static int PCI_ScanBusForNonBridge(struct controller *ctrl, u8 bus_num, u8 *dev_
        }
        for (tdevice = 0; tdevice < 0xFF; tdevice++) {
                /* Scan for access first */
-               if (PCI_RefinedAccessConfig(ctrl->pci_bus, tdevice, 0x08, &work) == -1)
+               ret = PCI_RefinedAccessConfig(ctrl->pci_bus, tdevice, 0x08, &work);
+               if (ret)
                        continue;
                dbg("Looking for bridge bus_num %d dev_num %d\n", bus_num, tdevice);
                /* Yep we got one. bridge ? */