aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/mm
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-01-29 02:14:29 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-01-29 02:14:29 -0500
commit9762528f37ddc7071509dddb10e7b4b3b957fd01 (patch)
tree88febf952479c46ef59c96386e02dd24842685f5 /arch/sh/mm
parentabec86a80247ab3a40d2afc9c8e8c26efcab2391 (diff)
sh: Kill off deprecated fixed PCI memory window accessors.
This kills off the deprected fixed memory range accessors for the cases of non-translatable ioremapping. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm')
-rw-r--r--arch/sh/mm/ioremap.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c
index bb03308e8408..94583c5da855 100644
--- a/arch/sh/mm/ioremap.c
+++ b/arch/sh/mm/ioremap.c
@@ -46,18 +46,6 @@ __ioremap_caller(unsigned long phys_addr, unsigned long size,
46 return NULL; 46 return NULL;
47 47
48 /* 48 /*
49 * If we're in the fixed PCI memory range, mapping through page
50 * tables is not only pointless, but also fundamentally broken.
51 * Just return the physical address instead.
52 *
53 * For boards that map a small PCI memory aperture somewhere in
54 * P1/P2 space, ioremap() will already do the right thing,
55 * and we'll never get this far.
56 */
57 if (is_pci_memory_fixed_range(phys_addr, size))
58 return (void __iomem *)phys_addr;
59
60 /*
61 * Mappings have to be page-aligned 49 * Mappings have to be page-aligned
62 */ 50 */
63 offset = phys_addr & ~PAGE_MASK; 51 offset = phys_addr & ~PAGE_MASK;
@@ -125,9 +113,6 @@ static inline int iomapping_nontranslatable(unsigned long offset)
125 return 1; 113 return 1;
126#endif 114#endif
127 115
128 if (is_pci_memory_fixed_range(offset, 0))
129 return 1;
130
131 return 0; 116 return 0;
132} 117}
133 118