PCI: Move the acquiring the reference of pci bus inside pci_alloc_dev()
Subsystems (6)
PATCH 3/3 PCI: Move the acquiring the reference of pci bus inside pci_alloc_dev()
Quoted 1 line
From
0c45a7fca2276123d0b926a22ea69158dad8ab9cMon Sep 17 00:00:00 2001
From: Gu Zheng <[email protected]>
Date: Thu, 18 Apr 2013 17:42:12 +0900
Subject: [PATCH 3/3] PCI: Move the acquiring the reference of pci bus inside pci_alloc_dev()
Move the acquiring the reference of pci bus inside pci_alloc_dev() when we create a pci devive.
Signed-off-by Gu Zheng <[email protected]>
Reviewed-by Li Guang <[email protected]>
--- arch/powerpc/kernel/pci_of_scan.c | 3 +-- drivers/char/agp/alpha-agp.c | 2 +- drivers/char/agp/parisc-agp.c | 2 +- drivers/pci/iov.c | 2 +- drivers/pci/probe.c | 8 +++++--- drivers/scsi/megaraid.c | 2 +- include/linux/pci.h | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-)
arch/powerpc/kernel/pci_of_scan.c +1 -2
@@ -128,7 +128,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node,const char *type;struct pci_slot *slot; - dev =pci_alloc_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 =pci_bus_get (bus); dev->dev.of_node =of_node_get (node); dev->dev.parent = bus->bridge; dev->dev.bus = &pci_bus_type;
drivers/char/agp/alpha-agp.c +1 -1
@@ -174,7 +174,7 @@ alpha_core_agp_setup(void)/* * Build a fake pci_dev struct */ - pdev =pci_alloc_dev (); + pdev =pci_alloc_dev (NULL );if (!pdev)return -ENOMEM ; pdev->vendor =0xffff ;
drivers/char/agp/parisc-agp.c +1 -1
@@ -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 =pci_alloc_dev (); + fake_bridge_dev =pci_alloc_dev (NULL );if (!fake_bridge_dev) { error = -ENOMEM ; goto fail;
drivers/pci/iov.c +1 -1
@@ -77,7 +77,7 @@ static int virtfn_add(struct pci_dev *dev, int id, int reset)struct resource *res;struct pci_sriov *iov = dev->sriov; - virtfn =pci_alloc_dev (); + virtfn =pci_alloc_dev (NULL );if (!virtfn)return -ENOMEM ;
drivers/pci/probe.c +5 -3
@@ -1199,7 +1199,7 @@ static void pci_release_bus_bridge_dev(struct device *dev)kfree (bridge); } -struct pci_dev *pci_alloc_dev (void ) +struct pci_dev *pci_alloc_dev (struct pci_bus *bus) {struct pci_dev *dev;
@@ -1209,6 +1209,9 @@ struct pci_dev *pci_alloc_dev(void)INIT_LIST_HEAD (&dev->bus_list); +if (bus) + dev->bus =pci_bus_get (bus); +return dev; }EXPORT_SYMBOL (pci_alloc_dev);
@@ -1261,11 +1264,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 =pci_alloc_dev (); + dev =pci_alloc_dev (bus);if (!dev)return NULL ; - dev->bus =pci_bus_get (bus); dev->devfn = devfn; dev->vendor = l &0xffff ; dev->device = (l >>16 ) &0xffff ;
drivers/scsi/megaraid.c +1 -1
@@ -2025,7 +2025,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 =pci_alloc_dev (); + *pdev =pci_alloc_dev (NULL );if ( *pdev ==NULL )return -1 ;
include/linux/pci.h +1 -1
@@ -348,7 +348,7 @@ static inline struct pci_dev *pci_physfn(struct pci_dev *dev)return dev; } -extern struct pci_dev *pci_alloc_dev (void ); +extern struct pci_dev *pci_alloc_dev (struct pci_bus *bus);#define to_pci_dev (n) container_of(n, struct pci_dev, dev)#define for_each_pci_dev (d) while ((d = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL)
Signature · 1 line
1.7.1