diff options
author | Rob Herring <rob.herring@calxeda.com> | 2013-09-07 14:07:11 -0500 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2013-10-09 20:04:06 -0500 |
commit | 25ff79443cbfa924b8df1d4a8a0fbff83816938a (patch) | |
tree | e7a9ac5cb39449b55d132c0838f7d866bc7d703c /arch/x86 | |
parent | ba904f0649357a3cbd67e752d30898c42b1fc91a (diff) | |
download | op-kernel-dev-25ff79443cbfa924b8df1d4a8a0fbff83816938a.zip op-kernel-dev-25ff79443cbfa924b8df1d4a8a0fbff83816938a.tar.gz |
of: implement pci_address_to_pio as weak function
Implement pci_address_to_pio as weak function to remove the dependency on
asm/prom.h. This is in preparation to make prom.h optional.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Grant Likely <grant.likely@linaro.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/include/asm/prom.h | 3 | ||||
-rw-r--r-- | arch/x86/kernel/devicetree.c | 10 |
2 files changed, 0 insertions, 13 deletions
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h index bade6ac..8ef2ec7 100644 --- a/arch/x86/include/asm/prom.h +++ b/arch/x86/include/asm/prom.h @@ -39,9 +39,6 @@ static inline void x86_dtb_init(void) { } extern char cmd_line[COMMAND_LINE_SIZE]; -#define pci_address_to_pio pci_address_to_pio -unsigned long pci_address_to_pio(phys_addr_t addr); - #define HAVE_ARCH_DEVTREE_FIXUPS #endif /* __ASSEMBLY__ */ diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c index 679d676..cffd073 100644 --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c @@ -27,16 +27,6 @@ char __initdata cmd_line[COMMAND_LINE_SIZE]; int __initdata of_ioapic; -unsigned long pci_address_to_pio(phys_addr_t address) -{ - /* - * The ioport address can be directly used by inX / outX - */ - BUG_ON(address >= (1 << 16)); - return (unsigned long)address; -} -EXPORT_SYMBOL_GPL(pci_address_to_pio); - void __init early_init_dt_scan_chosen_arch(unsigned long node) { BUG(); |