Merge tag 'ceph-for-6.6-rc1' of https://github.com/ceph/ceph-client

[linux-2.6-block.git] / drivers / pci / pci-driver.c

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index ae9baf801681d0bda21f721c569c93a162848d1a..a79c110c7e510e73b598b48e5ac3c0daffdc2341 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -193,7 +193,7 @@ static ssize_t new_id_store(struct device_driver *driver, const char *buf,
        u32 vendor, device, subvendor = PCI_ANY_ID,
                subdevice = PCI_ANY_ID, class = 0, class_mask = 0;
        unsigned long driver_data = 0;
-       int fields = 0;
+       int fields;
        int retval = 0;
 
        fields = sscanf(buf, "%x %x %x %x %x %x %lx",
@@ -260,7 +260,7 @@ static ssize_t remove_id_store(struct device_driver *driver, const char *buf,
        struct pci_driver *pdrv = to_pci_driver(driver);
        u32 vendor, device, subvendor = PCI_ANY_ID,
                subdevice = PCI_ANY_ID, class = 0, class_mask = 0;
-       int fields = 0;
+       int fields;
        size_t retval = -ENODEV;
 
        fields = sscanf(buf, "%x %x %x %x %x %x",
@@ -1474,14 +1474,15 @@ static struct pci_driver pci_compat_driver = {
  */
 struct pci_driver *pci_dev_driver(const struct pci_dev *dev)
 {
+       int i;
+
        if (dev->driver)
                return dev->driver;
-       else {
-               int i;
-               for (i = 0; i <= PCI_ROM_RESOURCE; i++)
-                       if (dev->resource[i].flags & IORESOURCE_BUSY)
-                               return &pci_compat_driver;
-       }
+
+       for (i = 0; i <= PCI_ROM_RESOURCE; i++)
+               if (dev->resource[i].flags & IORESOURCE_BUSY)
+                       return &pci_compat_driver;
+
        return NULL;
 }
 EXPORT_SYMBOL(pci_dev_driver);
@@ -1705,7 +1706,6 @@ struct bus_type pcie_port_bus_type = {
        .name           = "pci_express",
        .match          = pcie_port_bus_match,
 };
-EXPORT_SYMBOL_GPL(pcie_port_bus_type);
 #endif
 
 static int __init pci_driver_init(void)