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>

diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index 2a67e9baa59f80200f4a25b5a75471c04f04c776..24d01c4eac5cd344f05b6032d6326f87640a52d3 100644 (file)
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -128,7 +128,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
        const char *type;
        struct pci_slot *slot;
 
-       dev = alloc_pci_dev();
+       dev = pci_alloc_dev(bus);
        if (!dev)
                return NULL;
        type = of_get_property(node, "device_type", NULL);
@@ -137,7 +137,6 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,
 
        pr_debug("    create device, devfn: %x, type: %s\n", devfn, type);
 
-       dev->bus = bus;
        dev->dev.of_node = of_node_get(node);
        dev->dev.parent = bus->bridge;
        dev->dev.bus = &pci_bus_type;

diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index baf4366e2d6afe937db5fe792c3183d56da4c580..e5871fb455b3276d3344f8dc5e0e7d0fa1d0aff4 100644 (file)
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -254,7 +254,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
        const char *type;
        u32 class;
 
-       dev = alloc_pci_dev();
+       dev = pci_alloc_dev(bus);
        if (!dev)
                return NULL;
 
@@ -281,7 +281,6 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
                printk("    create device, devfn: %x, type: %s\n",
                       devfn, type);
 
-       dev->bus = bus;
        dev->sysdata = node;
        dev->dev.parent = bus->bridge;
        dev->dev.bus = &pci_bus_type;

diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c
index dd84af4d4f7e1cfdd0c74e576269d1744e1cfdef..199b8e99f7d7886d5d5e59b4fff5bf43337e523d 100644 (file)
--- a/drivers/char/agp/alpha-agp.c
+++ b/drivers/char/agp/alpha-agp.c
@@ -174,7 +174,7 @@ alpha_core_agp_setup(void)
        /*
         * Build a fake pci_dev struct
         */
-       pdev = alloc_pci_dev();
+       pdev = pci_alloc_dev(NULL);
        if (!pdev)
                return -ENOMEM;
        pdev->vendor = 0xffff;

diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c
index 94821ab01c6d6ae1803201c27217c69a30357329..bf5d2477cb77c296dac3a63b3aea2e8a2ec5ce0a 100644 (file)
--- a/drivers/char/agp/parisc-agp.c
+++ b/drivers/char/agp/parisc-agp.c
@@ -333,7 +333,7 @@ parisc_agp_setup(void __iomem *ioc_hpa, void __iomem *lba_hpa)
        struct agp_bridge_data *bridge;
        int error = 0;
 
-       fake_bridge_dev = alloc_pci_dev();
+       fake_bridge_dev = pci_alloc_dev(NULL);
        if (!fake_bridge_dev) {
                error = -ENOMEM;
                goto fail;

diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index c93071d428f5d6d6cb038d5cb614e4117c5fd8aa..2652ca00fae740d510b0edcbf6256d3bb78d3525 100644 (file)
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -75,18 +75,20 @@ static int virtfn_add(struct pci_dev *dev, int id, int reset)
        struct pci_dev *virtfn;
        struct resource *res;
        struct pci_sriov *iov = dev->sriov;
+       struct pci_bus *bus;
 
-       virtfn = alloc_pci_dev();
+       virtfn = pci_alloc_dev(NULL);
        if (!virtfn)
                return -ENOMEM;
 
        mutex_lock(&iov->dev->sriov->lock);
-       virtfn->bus = virtfn_add_bus(dev->bus, virtfn_bus(dev, id));
-       if (!virtfn->bus) {
+       bus = virtfn_add_bus(dev->bus, virtfn_bus(dev, id));
+       if (!bus) {
                kfree(virtfn);
                mutex_unlock(&iov->dev->sriov->lock);
                return -ENOMEM;
        }
+       virtfn->bus = pci_bus_get(bus);
        virtfn->devfn = virtfn_devfn(dev, id);
        virtfn->vendor = dev->vendor;
        pci_read_config_word(dev, iov->pos + PCI_SRIOV_VF_DID, &virtfn->device);

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index d47ce1400c268fa0a849721dbd7494167cdc545f..ed5ce185eed99fac256e7bcec3600ab1ee92ecf9 100644 (file)
--- 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;
        }

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 846f475f62c160890835f33a234f85c6a175a222..90c95a3385d18bb52f93093da10c8d400514f712 100644 (file)
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -2026,7 +2026,7 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor)
 static inline int
 make_local_pdev(adapter_t *adapter, struct pci_dev **pdev)
 {
-       *pdev = alloc_pci_dev();
+       *pdev = pci_alloc_dev(NULL);
 
        if( *pdev == NULL ) return -1;