diff options
author | Toshi Kani <toshi.kani@hp.com> | 2015-06-04 12:55:17 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-06-07 09:28:57 -0400 |
commit | c7c95f19f37976731efca9576f6e4a22067798a2 (patch) | |
tree | 3fb0f44bd215ae80b8fe1f865e80bac425468820 /arch/m68k | |
parent | 556269c138a8b2d3f5714b8105fa6119ecc505f2 (diff) |
video/fbdev, asm/io.h: Remove ioremap_writethrough()
Replace all calls to ioremap_writethrough() with ioremap_wt().
Remove ioremap_writethrough() too.
Signed-off-by: Toshi Kani <toshi.kani@hp.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Elliott@hp.com
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: arnd@arndb.de
Cc: hch@lst.de
Cc: hmh@hmh.eng.br
Cc: jgross@suse.com
Cc: konrad.wilk@oracle.com
Cc: linux-mm <linux-mm@kvack.org>
Cc: linux-nvdimm@lists.01.org
Cc: stefan.bader@canonical.com
Cc: yigal@plexistor.com
Link: http://lkml.kernel.org/r/1433436928-31903-10-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/include/asm/io_mm.h | 5 | ||||
-rw-r--r-- | arch/m68k/include/asm/io_no.h | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h index 7c12138bb3cb..618c85d3c786 100644 --- a/arch/m68k/include/asm/io_mm.h +++ b/arch/m68k/include/asm/io_mm.h | |||
@@ -467,11 +467,6 @@ static inline void __iomem *ioremap_nocache(unsigned long physaddr, unsigned lon | |||
467 | { | 467 | { |
468 | return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); | 468 | return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); |
469 | } | 469 | } |
470 | static inline void __iomem *ioremap_writethrough(unsigned long physaddr, | ||
471 | unsigned long size) | ||
472 | { | ||
473 | return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); | ||
474 | } | ||
475 | static inline void __iomem *ioremap_wt(unsigned long physaddr, | 470 | static inline void __iomem *ioremap_wt(unsigned long physaddr, |
476 | unsigned long size) | 471 | unsigned long size) |
477 | { | 472 | { |
diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h index 5fff9a22296e..ad7bd40e6742 100644 --- a/arch/m68k/include/asm/io_no.h +++ b/arch/m68k/include/asm/io_no.h | |||
@@ -155,10 +155,6 @@ static inline void *ioremap_nocache(unsigned long physaddr, unsigned long size) | |||
155 | { | 155 | { |
156 | return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); | 156 | return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); |
157 | } | 157 | } |
158 | static inline void *ioremap_writethrough(unsigned long physaddr, unsigned long size) | ||
159 | { | ||
160 | return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); | ||
161 | } | ||
162 | static inline void *ioremap_wt(unsigned long physaddr, unsigned long size) | 158 | static inline void *ioremap_wt(unsigned long physaddr, unsigned long size) |
163 | { | 159 | { |
164 | return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); | 160 | return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); |