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 /drivers/video | |
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 'drivers/video')
-rw-r--r-- | drivers/video/fbdev/amifb.c | 4 | ||||
-rw-r--r-- | drivers/video/fbdev/atafb.c | 3 | ||||
-rw-r--r-- | drivers/video/fbdev/hpfb.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/drivers/video/fbdev/amifb.c b/drivers/video/fbdev/amifb.c index 35f7900a0573..ee3a703acf23 100644 --- a/drivers/video/fbdev/amifb.c +++ b/drivers/video/fbdev/amifb.c | |||
@@ -3705,8 +3705,8 @@ default_chipset: | |||
3705 | * access the videomem with writethrough cache | 3705 | * access the videomem with writethrough cache |
3706 | */ | 3706 | */ |
3707 | info->fix.smem_start = (u_long)ZTWO_PADDR(videomemory); | 3707 | info->fix.smem_start = (u_long)ZTWO_PADDR(videomemory); |
3708 | videomemory = (u_long)ioremap_writethrough(info->fix.smem_start, | 3708 | videomemory = (u_long)ioremap_wt(info->fix.smem_start, |
3709 | info->fix.smem_len); | 3709 | info->fix.smem_len); |
3710 | if (!videomemory) { | 3710 | if (!videomemory) { |
3711 | dev_warn(&pdev->dev, | 3711 | dev_warn(&pdev->dev, |
3712 | "Unable to map videomem cached writethrough\n"); | 3712 | "Unable to map videomem cached writethrough\n"); |
diff --git a/drivers/video/fbdev/atafb.c b/drivers/video/fbdev/atafb.c index cb9ee2556850..d6ce613e12ad 100644 --- a/drivers/video/fbdev/atafb.c +++ b/drivers/video/fbdev/atafb.c | |||
@@ -3185,8 +3185,7 @@ int __init atafb_init(void) | |||
3185 | /* Map the video memory (physical address given) to somewhere | 3185 | /* Map the video memory (physical address given) to somewhere |
3186 | * in the kernel address space. | 3186 | * in the kernel address space. |
3187 | */ | 3187 | */ |
3188 | external_screen_base = ioremap_writethrough(external_addr, | 3188 | external_screen_base = ioremap_wt(external_addr, external_len); |
3189 | external_len); | ||
3190 | if (external_vgaiobase) | 3189 | if (external_vgaiobase) |
3191 | external_vgaiobase = | 3190 | external_vgaiobase = |
3192 | (unsigned long)ioremap(external_vgaiobase, 0x10000); | 3191 | (unsigned long)ioremap(external_vgaiobase, 0x10000); |
diff --git a/drivers/video/fbdev/hpfb.c b/drivers/video/fbdev/hpfb.c index a1b7e5fa9b09..9476d196f510 100644 --- a/drivers/video/fbdev/hpfb.c +++ b/drivers/video/fbdev/hpfb.c | |||
@@ -241,8 +241,8 @@ static int hpfb_init_one(unsigned long phys_base, unsigned long virt_base) | |||
241 | fb_info.fix.line_length = fb_width; | 241 | fb_info.fix.line_length = fb_width; |
242 | fb_height = (in_8(fb_regs + HPFB_FBHMSB) << 8) | in_8(fb_regs + HPFB_FBHLSB); | 242 | fb_height = (in_8(fb_regs + HPFB_FBHMSB) << 8) | in_8(fb_regs + HPFB_FBHLSB); |
243 | fb_info.fix.smem_len = fb_width * fb_height; | 243 | fb_info.fix.smem_len = fb_width * fb_height; |
244 | fb_start = (unsigned long)ioremap_writethrough(fb_info.fix.smem_start, | 244 | fb_start = (unsigned long)ioremap_wt(fb_info.fix.smem_start, |
245 | fb_info.fix.smem_len); | 245 | fb_info.fix.smem_len); |
246 | hpfb_defined.xres = (in_8(fb_regs + HPFB_DWMSB) << 8) | in_8(fb_regs + HPFB_DWLSB); | 246 | hpfb_defined.xres = (in_8(fb_regs + HPFB_DWMSB) << 8) | in_8(fb_regs + HPFB_DWLSB); |
247 | hpfb_defined.yres = (in_8(fb_regs + HPFB_DHMSB) << 8) | in_8(fb_regs + HPFB_DHLSB); | 247 | hpfb_defined.yres = (in_8(fb_regs + HPFB_DHMSB) << 8) | in_8(fb_regs + HPFB_DHLSB); |
248 | hpfb_defined.xres_virtual = hpfb_defined.xres; | 248 | hpfb_defined.xres_virtual = hpfb_defined.xres; |