diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 11:24:11 -0700 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 11:46:51 -0700 |
commit | b5d937de0367d26f65b9af1aef5f2c34c1939be0 (patch) | |
tree | e91eaaa72ef1aae543a1fa494171f7e3c0c14d94 /arch/powerpc/include/asm/pci.h | |
parent | 04bea68b2f0eeebb089ecc67b618795925268b4a (diff) | |
download | op-kernel-dev-b5d937de0367d26f65b9af1aef5f2c34c1939be0.zip op-kernel-dev-b5d937de0367d26f65b9af1aef5f2c34c1939be0.tar.gz |
powerpc/pci: Make both ppc32 and ppc64 use sysdata for pci_controller
Currently, ppc32 uses sysdata for the pci_controller pointer, and
ppc64 uses it to hold the device_node pointer. This patch moves the
of_node pointer into (struct pci_bus*)->dev.of_node and
(struct pci_dev*)->dev.of_node so that sysdata can be converted to always
use the pci_controller pointer instead. It also fixes up the
allocating of pci devices so that the of_node pointer gets assigned
consistently and increments the ref count.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/powerpc/include/asm/pci.h')
-rw-r--r-- | arch/powerpc/include/asm/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h index a20a9ad..7d77909 100644 --- a/arch/powerpc/include/asm/pci.h +++ b/arch/powerpc/include/asm/pci.h @@ -201,7 +201,7 @@ extern void pci_resource_to_user(const struct pci_dev *dev, int bar, extern void pcibios_setup_bus_devices(struct pci_bus *bus); extern void pcibios_setup_bus_self(struct pci_bus *bus); extern void pcibios_setup_phb_io_space(struct pci_controller *hose); -extern void pcibios_scan_phb(struct pci_controller *hose, void *sysdata); +extern void pcibios_scan_phb(struct pci_controller *hose); #endif /* __KERNEL__ */ #endif /* __ASM_POWERPC_PCI_H */ |