leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pci/of: Consolidate pci_bus_to_OF_node()

Browse Source 
The generic code always get the device-node in the right place now
so a single implementation will work for all archs

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Benjamin Herrenschmidt 2011-04-11 11:34:33 +10:00
parent 64099d981c
commit ef3b4f8cc2
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/microblaze/include/asm/pci-bridge.h
View File

@ -102,11 +102,6 @@ struct pci_controller {
}; };
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
{
return bus->dev.of_node;
}
static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus) static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus)
{ {
return bus->sysdata; return bus->sysdata;

5
arch/powerpc/include/asm/pci-bridge.h
View File

@ -169,11 +169,6 @@ static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus)
return bus->sysdata; return bus->sysdata;
} }
static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
{
return bus->dev.of_node;
}
#ifndef CONFIG_PPC64 #ifndef CONFIG_PPC64
extern int pci_device_from_OF_node(struct device_node *node, extern int pci_device_from_OF_node(struct device_node *node,

6
arch/x86/include/asm/prom.h
View File

@ -30,12 +30,6 @@ extern void add_dtb(u64 data);
extern void x86_add_irq_domains(void); extern void x86_add_irq_domains(void);
void __cpuinit x86_of_pci_init(void); void __cpuinit x86_of_pci_init(void);
void x86_dtb_init(void); void x86_dtb_init(void);
static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
{
return pci_device_to_OF_node(bus->self);
}
#else #else
static inline void add_dtb(u64 data) { } static inline void add_dtb(u64 data) { }
static inline void x86_add_irq_domains(void) { } static inline void x86_add_irq_domains(void) { }

5
include/linux/pci.h
View File

@ -1605,6 +1605,11 @@ static inline struct device_node *pci_device_to_OF_node(struct pci_dev *pdev)
return pdev ? pdev->dev.of_node : NULL; return pdev ? pdev->dev.of_node : NULL;
} }
static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
{
return bus ? bus->dev.of_node : NULL;
}
#else /* CONFIG_OF */ #else /* CONFIG_OF */
static inline void pci_set_of_node(struct pci_dev *dev) { } static inline void pci_set_of_node(struct pci_dev *dev) { }
static inline void pci_release_of_node(struct pci_dev *dev) { } static inline void pci_release_of_node(struct pci_dev *dev) { }