Skip to contentSkip to conversation

PCI: Use PCI_STD_NUM_BARS when checking standard BARs

PATCH New Bjorn Helgaas 1 participant 1 message Jan 21, 2022 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: Use PCI_STD_NUM_BARS when checking standard BARs

From: Bjorn Helgaas <[email protected]>

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")

---
 drivers/usb/core/hcd-pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/core/hcd-pci.c +1 -1
index d630cccd2e6e..784466117c92 100644
@@ -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;
Signature · 1 line
2.25.1