USB: hcd-pci: Use PCI_STD_NUM_BARS when checking standard BARs
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 21 Jan 2022 18:33:30 +0000 (12:33 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Jan 2022 13:02:51 +0000 (14:02 +0100)
usb_hcd_pci_probe() searches for an I/O BAR using a combination of
PCI_STD_NUM_BARS (to control loop iteration) and PCI_ROM_RESOURCE (to check
whether the loop exits without finding anything).

Use PCI_STD_NUM_BARS consistently.

No functional change since PCI_STD_NUM_BARS == PCI_ROM_RESOURCE, but this
removes a dependency on that relationship and makes the code read better.

Fixes: c9c13ba428ef ("PCI: Add PCI_STD_NUM_BARS for the number of standard BARs")
Cc: Denis Efremov <efremov@linux.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20220121183330.1141702-1-helgaas@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/hcd-pci.c

index d630ccc..7844661 100644 (file)
@@ -248,7 +248,7 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id,
                                        hcd->rsrc_len, driver->description))
                                break;
                }
-               if (region == PCI_ROM_RESOURCE) {
+               if (region == PCI_STD_NUM_BARS) {
                        dev_dbg(&dev->dev, "no i/o regions available\n");
                        retval = -EBUSY;
                        goto put_hcd;