Skip to content

Commit

Permalink
video: da8xx-fb: use __iomem pointers for MMIO
Browse files Browse the repository at this point in the history
ARM is moving to stricter checks on readl/write functions,
so we need to use the correct types everywhere.

Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: linux-fbdev@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed Sep 19, 2012
1 parent f39f7b7 commit 34aef6e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/video/da8xx-fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
#define UPPER_MARGIN 32
#define LOWER_MARGIN 32

static resource_size_t da8xx_fb_reg_base;
static void __iomem *da8xx_fb_reg_base;
static struct resource *lcdc_regs;
static unsigned int lcd_revision;
static irq_handler_t lcdc_irq_handler;
Expand Down Expand Up @@ -951,7 +951,7 @@ static int __devexit fb_remove(struct platform_device *dev)
clk_disable(par->lcdc_clk);
clk_put(par->lcdc_clk);
framebuffer_release(info);
iounmap((void __iomem *)da8xx_fb_reg_base);
iounmap(da8xx_fb_reg_base);
release_mem_region(lcdc_regs->start, resource_size(lcdc_regs));

}
Expand Down Expand Up @@ -1171,7 +1171,7 @@ static int __devinit fb_probe(struct platform_device *device)
if (!lcdc_regs)
return -EBUSY;

da8xx_fb_reg_base = (resource_size_t)ioremap(lcdc_regs->start, len);
da8xx_fb_reg_base = ioremap(lcdc_regs->start, len);
if (!da8xx_fb_reg_base) {
ret = -EBUSY;
goto err_request_mem;
Expand Down Expand Up @@ -1392,7 +1392,7 @@ static int __devinit fb_probe(struct platform_device *device)
clk_put(fb_clk);

err_ioremap:
iounmap((void __iomem *)da8xx_fb_reg_base);
iounmap(da8xx_fb_reg_base);

err_request_mem:
release_mem_region(lcdc_regs->start, len);
Expand Down

0 comments on commit 34aef6e

Please sign in to comment.