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

pci/of: Consolidate pci_device_to_OF_node()

Browse Source 
All archs do more or less the same thing now, move it into
a single generic place.

I chose pci.h rather than of_pci.h to avoid having to change
all call-sites to include the later.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Benjamin Herrenschmidt 2011-04-07 13:09:47 +10:00
parent 3d5fe5a65a
commit 64099d981c
8 changed files with 5 additions and 35 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
static inline struct device_node *pci_device_to_OF_node(struct pci_dev *dev)
{
return dev->dev.of_node;
}
static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
{
return bus->dev.of_node;

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;
}
static inline struct device_node *pci_device_to_OF_node(struct pci_dev *dev)
{
return dev->dev.of_node;
}
static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
{
return bus->dev.of_node;

3
arch/sparc/include/asm/pci_32.h
View File

@ -42,9 +42,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
}
#endif
struct device_node;
extern struct device_node *pci_device_to_OF_node(struct pci_dev *pdev);
#endif /* __KERNEL__ */
/* generic pci stuff */

3
arch/sparc/include/asm/pci_64.h
View File

@ -91,9 +91,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
return PCI_IRQ_NONE;
}
struct device_node;
extern struct device_node *pci_device_to_OF_node(struct pci_dev *pdev);
#define HAVE_ARCH_PCI_RESOURCE_TO_USER
extern void pci_resource_to_user(const struct pci_dev *dev, int bar,
const struct resource *rsrc,

6
arch/sparc/kernel/pci.c
View File

@ -1021,12 +1021,6 @@ void arch_teardown_msi_irq(unsigned int irq)
}
#endif /* !(CONFIG_PCI_MSI) */
struct device_node *pci_device_to_OF_node(struct pci_dev *pdev)
{
return pdev->dev.of_node;
}
EXPORT_SYMBOL(pci_device_to_OF_node);
static void ali_sound_dma_hack(struct pci_dev *pdev, int set_bit)
{
struct pci_dev *ali_isa_bridge;

8
arch/sparc/kernel/pcic.c
View File

@ -885,14 +885,6 @@ int pcibios_assign_resource(struct pci_dev *pdev, int resource)
return -ENXIO;
}
struct device_node *pci_device_to_OF_node(struct pci_dev *pdev)
{
struct pcidev_cookie *pc = pdev->sysdata;
return pc->prom_node;
}
EXPORT_SYMBOL(pci_device_to_OF_node);
/*
* This probably belongs here rather than ioport.c because
* we do not want this crud linked into SBus kernels.

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

@ -31,11 +31,6 @@ extern void x86_add_irq_domains(void);
void __cpuinit x86_of_pci_init(void);
void x86_dtb_init(void);
static inline struct device_node *pci_device_to_OF_node(struct pci_dev *pdev)
{
return pdev ? pdev->dev.of_node : NULL;
}
static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
{
return pci_device_to_OF_node(bus->self);

5
include/linux/pci.h
View File

@ -1600,6 +1600,11 @@ extern void pci_release_bus_of_node(struct pci_bus *bus);
/* Arch may override this (weak) */
extern struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus);
static inline struct device_node *pci_device_to_OF_node(struct pci_dev *pdev)
{
return pdev ? pdev->dev.of_node : NULL;
}
#else /* CONFIG_OF */
static inline void pci_set_of_node(struct pci_dev *dev) { }
static inline void pci_release_of_node(struct pci_dev *dev) { }