diff options
author | Maciej W. Rozycki <macro@linux-mips.org> | 2008-06-09 12:19:53 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-15 13:44:29 -0400 |
commit | c88a8b4ab0e1a1f06938939d9ba42e9da6144ccb (patch) | |
tree | 6aee2390a9a5506176acb567021c8503200e1971 /arch | |
parent | cb11dfa0247df479e384c4a7ab6846f3a6bf1570 (diff) |
[MIPS] Remove obsolete isa_slot_offset
The isa_slot_offset variable and its __ISA_IO_base macro is not used
anywhere anymore. It does not look like a decent interface per today's
standards either. Remove both including all places of initialization.
Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/jazz/setup.c | 1 | ||||
-rw-r--r-- | arch/mips/kernel/setup.c | 7 | ||||
-rw-r--r-- | arch/mips/pci/pci-bcm1480.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/pci-sb1250.c | 3 | ||||
-rw-r--r-- | arch/mips/sni/setup.c | 1 |
5 files changed, 0 insertions, 14 deletions
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c index a7947199c99b..f136c8a8591c 100644 --- a/arch/mips/jazz/setup.c +++ b/arch/mips/jazz/setup.c | |||
@@ -79,7 +79,6 @@ void __init plat_mem_setup(void) | |||
79 | if (mips_machtype == MACH_MIPS_MAGNUM_4000) | 79 | if (mips_machtype == MACH_MIPS_MAGNUM_4000) |
80 | EISA_bus = 1; | 80 | EISA_bus = 1; |
81 | #endif | 81 | #endif |
82 | isa_slot_offset = 0xe3000000; | ||
83 | 82 | ||
84 | /* request I/O space for devices used on all i[345]86 PCs */ | 83 | /* request I/O space for devices used on all i[345]86 PCs */ |
85 | for (i = 0; i < ARRAY_SIZE(jazz_io_resources); i++) | 84 | for (i = 0; i < ARRAY_SIZE(jazz_io_resources); i++) |
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index c6a063b2a0d9..c04e4e3afede 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
@@ -68,13 +68,6 @@ static char command_line[CL_SIZE]; | |||
68 | const unsigned long mips_io_port_base __read_mostly = -1; | 68 | const unsigned long mips_io_port_base __read_mostly = -1; |
69 | EXPORT_SYMBOL(mips_io_port_base); | 69 | EXPORT_SYMBOL(mips_io_port_base); |
70 | 70 | ||
71 | /* | ||
72 | * isa_slot_offset is the address where E(ISA) busaddress 0 is mapped | ||
73 | * for the processor. | ||
74 | */ | ||
75 | unsigned long isa_slot_offset; | ||
76 | EXPORT_SYMBOL(isa_slot_offset); | ||
77 | |||
78 | static struct resource code_resource = { .name = "Kernel code", }; | 71 | static struct resource code_resource = { .name = "Kernel code", }; |
79 | static struct resource data_resource = { .name = "Kernel data", }; | 72 | static struct resource data_resource = { .name = "Kernel data", }; |
80 | 73 | ||
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c index 87e2c8f54e2d..d19d262157f2 100644 --- a/arch/mips/pci/pci-bcm1480.c +++ b/arch/mips/pci/pci-bcm1480.c | |||
@@ -254,8 +254,6 @@ static int __init bcm1480_pcibios_init(void) | |||
254 | ioremap(A_BCM1480_PHYS_PCI_IO_MATCH_BYTES, 65536); | 254 | ioremap(A_BCM1480_PHYS_PCI_IO_MATCH_BYTES, 65536); |
255 | bcm1480_controller.io_map_base -= bcm1480_controller.io_offset; | 255 | bcm1480_controller.io_map_base -= bcm1480_controller.io_offset; |
256 | set_io_port_base(bcm1480_controller.io_map_base); | 256 | set_io_port_base(bcm1480_controller.io_map_base); |
257 | isa_slot_offset = (unsigned long) | ||
258 | ioremap(A_BCM1480_PHYS_PCI_MEM_MATCH_BYTES, 1024*1024); | ||
259 | 257 | ||
260 | register_pci_controller(&bcm1480_controller); | 258 | register_pci_controller(&bcm1480_controller); |
261 | 259 | ||
diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c index 2a09ad91ec8c..9bc102a1380e 100644 --- a/arch/mips/pci/pci-sb1250.c +++ b/arch/mips/pci/pci-sb1250.c | |||
@@ -254,9 +254,6 @@ static int __init sb1250_pcibios_init(void) | |||
254 | * works correctly with most of Linux's drivers. | 254 | * works correctly with most of Linux's drivers. |
255 | * XXX ehs: Should this happen in PCI Device mode? | 255 | * XXX ehs: Should this happen in PCI Device mode? |
256 | */ | 256 | */ |
257 | isa_slot_offset = (unsigned long) | ||
258 | ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES_32, 1024 * 1024); | ||
259 | |||
260 | io_map_base = ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 1024 * 1024); | 257 | io_map_base = ioremap(A_PHYS_LDTPCI_IO_MATCH_BYTES, 1024 * 1024); |
261 | sb1250_controller.io_map_base = io_map_base; | 258 | sb1250_controller.io_map_base = io_map_base; |
262 | set_io_port_base((unsigned long)io_map_base); | 259 | set_io_port_base((unsigned long)io_map_base); |
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c index 5484e1c62054..a49272ce7ef5 100644 --- a/arch/mips/sni/setup.c +++ b/arch/mips/sni/setup.c | |||
@@ -116,7 +116,6 @@ void __init plat_mem_setup(void) | |||
116 | /* | 116 | /* |
117 | * Setup (E)ISA I/O memory access stuff | 117 | * Setup (E)ISA I/O memory access stuff |
118 | */ | 118 | */ |
119 | isa_slot_offset = CKSEG1ADDR(0xb0000000); | ||
120 | #ifdef CONFIG_EISA | 119 | #ifdef CONFIG_EISA |
121 | EISA_bus = 1; | 120 | EISA_bus = 1; |
122 | #endif | 121 | #endif |