aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/microblaze/include/asm/prom.h9
-rw-r--r--arch/mips/include/asm/prom.h11
-rw-r--r--arch/powerpc/include/asm/prom.h5
-rw-r--r--arch/x86/include/asm/prom.h3
-rw-r--r--arch/x86/kernel/devicetree.c10
5 files changed, 0 insertions, 38 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
index f05bedce70d0..0ebd924902df 100644
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@ -26,13 +26,4 @@ enum early_consoles {
26 26
27extern int of_early_console(void *version); 27extern int of_early_console(void *version);
28 28
29/*
30 * OF address retreival & translation
31 */
32
33#ifdef CONFIG_PCI
34extern unsigned long pci_address_to_pio(phys_addr_t address);
35#define pci_address_to_pio pci_address_to_pio
36#endif /* CONFIG_PCI */
37
38#endif /* _ASM_MICROBLAZE_PROM_H */ 29#endif /* _ASM_MICROBLAZE_PROM_H */
diff --git a/arch/mips/include/asm/prom.h b/arch/mips/include/asm/prom.h
index e3dbd0e0608e..ccd2b75f152c 100644
--- a/arch/mips/include/asm/prom.h
+++ b/arch/mips/include/asm/prom.h
@@ -19,17 +19,6 @@
19 19
20extern void device_tree_init(void); 20extern void device_tree_init(void);
21 21
22static inline unsigned long pci_address_to_pio(phys_addr_t address)
23{
24 /*
25 * The ioport address can be directly used by inX() / outX()
26 */
27 BUG_ON(address > IO_SPACE_LIMIT);
28
29 return (unsigned long) address;
30}
31#define pci_address_to_pio pci_address_to_pio
32
33struct boot_param_header; 22struct boot_param_header;
34 23
35extern void __dt_setup_arch(struct boot_param_header *bph); 24extern void __dt_setup_arch(struct boot_param_header *bph);
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index 7d0c7f3a7171..bd215f74df0f 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -30,11 +30,6 @@
30extern u64 of_translate_dma_address(struct device_node *dev, 30extern u64 of_translate_dma_address(struct device_node *dev,
31 const __be32 *in_addr); 31 const __be32 *in_addr);
32 32
33#ifdef CONFIG_PCI
34extern unsigned long pci_address_to_pio(phys_addr_t address);
35#define pci_address_to_pio pci_address_to_pio
36#endif /* CONFIG_PCI */
37
38/* Parse the ibm,dma-window property of an OF node into the busno, phys and 33/* Parse the ibm,dma-window property of an OF node into the busno, phys and
39 * size parameters. 34 * size parameters.
40 */ 35 */
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index bade6ac3b14f..8ef2ec70858f 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) { }
39 39
40extern char cmd_line[COMMAND_LINE_SIZE]; 40extern char cmd_line[COMMAND_LINE_SIZE];
41 41
42#define pci_address_to_pio pci_address_to_pio
43unsigned long pci_address_to_pio(phys_addr_t addr);
44
45#define HAVE_ARCH_DEVTREE_FIXUPS 42#define HAVE_ARCH_DEVTREE_FIXUPS
46 43
47#endif /* __ASSEMBLY__ */ 44#endif /* __ASSEMBLY__ */
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 679d676a30d7..cffd07368547 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -27,16 +27,6 @@ char __initdata cmd_line[COMMAND_LINE_SIZE];
27 27
28int __initdata of_ioapic; 28int __initdata of_ioapic;
29 29
30unsigned long pci_address_to_pio(phys_addr_t address)
31{
32 /*
33 * The ioport address can be directly used by inX / outX
34 */
35 BUG_ON(address >= (1 << 16));
36 return (unsigned long)address;
37}
38EXPORT_SYMBOL_GPL(pci_address_to_pio);
39
40void __init early_init_dt_scan_chosen_arch(unsigned long node) 30void __init early_init_dt_scan_chosen_arch(unsigned long node)
41{ 31{
42 BUG(); 32 BUG();