PCI: Convert alloc_pci_dev(void) to pci_alloc_dev(bus)

Use the new pci_alloc_dev(bus) to replace the existing using of
alloc_pci_dev(void).

[bhelgaas: drop pci_bus ref later in pci_release_dev()]
Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: David Airlie <airlied@linux.ie>
Cc: Neela Syam Kolli <megaraidlinux@lsi.com>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index d47ce1400c26..ed5ce185eed9 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1132,6 +1132,7 @@ static void pci_release_dev(struct device *dev)
         pci_dev = to_pci_dev(dev);
         pci_release_capabilities(pci_dev);
         pci_release_of_node(pci_dev);
+        pci_bus_put(pci_dev->bus);
         kfree(pci_dev);
 }
 
@@ -1270,11 +1271,10 @@ static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn)
         if (!pci_bus_read_dev_vendor_id(bus, devfn, &l, 60*1000))
                 return NULL;
 
-        dev = alloc_pci_dev();
+        dev = pci_alloc_dev(bus);
         if (!dev)
                 return NULL;
 
-        dev->bus = bus;
         dev->devfn = devfn;
         dev->vendor = l & 0xffff;
         dev->device = (l >> 16) & 0xffff;
@@ -1282,6 +1282,7 @@ static struct pci_dev *pci_scan_device(struct pci_bus *bus, int devfn)
         pci_set_of_node(dev);
 
         if (pci_setup_device(dev)) {
+                pci_bus_put(dev->bus);
                 kfree(dev);
                 return NULL;
         }