aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/agp
diff options
context:
space:
mode:
authorGu Zheng <guz.fnst@cn.fujitsu.com>2013-05-25 09:48:31 -0400
committerBjorn Helgaas <bhelgaas@google.com>2013-06-05 15:49:36 -0400
commit8b1fce04dc2a2210f050484afa85acc3a81cfbba (patch)
treed790a4d12baf35c9f32cafde8386d505a7576067 /drivers/char/agp
parent3c6e6ae770f338ef3e54c5823c21063204f53537 (diff)
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>
Diffstat (limited to 'drivers/char/agp')
-rw-r--r--drivers/char/agp/alpha-agp.c2
-rw-r--r--drivers/char/agp/parisc-agp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c
index dd84af4d4f7e..199b8e99f7d7 100644
--- a/drivers/char/agp/alpha-agp.c
+++ b/drivers/char/agp/alpha-agp.c
@@ -174,7 +174,7 @@ alpha_core_agp_setup(void)
174 /* 174 /*
175 * Build a fake pci_dev struct 175 * Build a fake pci_dev struct
176 */ 176 */
177 pdev = alloc_pci_dev(); 177 pdev = pci_alloc_dev(NULL);
178 if (!pdev) 178 if (!pdev)
179 return -ENOMEM; 179 return -ENOMEM;
180 pdev->vendor = 0xffff; 180 pdev->vendor = 0xffff;
diff --git a/drivers/char/agp/parisc-agp.c b/drivers/char/agp/parisc-agp.c
index 94821ab01c6d..bf5d2477cb77 100644
--- 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)
333 struct agp_bridge_data *bridge; 333 struct agp_bridge_data *bridge;
334 int error = 0; 334 int error = 0;
335 335
336 fake_bridge_dev = alloc_pci_dev(); 336 fake_bridge_dev = pci_alloc_dev(NULL);
337 if (!fake_bridge_dev) { 337 if (!fake_bridge_dev) {
338 error = -ENOMEM; 338 error = -ENOMEM;
339 goto fail; 339 goto fail;