diff options
Diffstat (limited to 'drivers/video/da8xx-fb.c')
-rw-r--r-- | drivers/video/da8xx-fb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index 7ae9d53f2bf1..113d43a16f54 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c | |||
@@ -131,7 +131,7 @@ | |||
131 | #define UPPER_MARGIN 32 | 131 | #define UPPER_MARGIN 32 |
132 | #define LOWER_MARGIN 32 | 132 | #define LOWER_MARGIN 32 |
133 | 133 | ||
134 | static resource_size_t da8xx_fb_reg_base; | 134 | static void __iomem *da8xx_fb_reg_base; |
135 | static struct resource *lcdc_regs; | 135 | static struct resource *lcdc_regs; |
136 | static unsigned int lcd_revision; | 136 | static unsigned int lcd_revision; |
137 | static irq_handler_t lcdc_irq_handler; | 137 | static irq_handler_t lcdc_irq_handler; |
@@ -951,7 +951,7 @@ static int __devexit fb_remove(struct platform_device *dev) | |||
951 | clk_disable(par->lcdc_clk); | 951 | clk_disable(par->lcdc_clk); |
952 | clk_put(par->lcdc_clk); | 952 | clk_put(par->lcdc_clk); |
953 | framebuffer_release(info); | 953 | framebuffer_release(info); |
954 | iounmap((void __iomem *)da8xx_fb_reg_base); | 954 | iounmap(da8xx_fb_reg_base); |
955 | release_mem_region(lcdc_regs->start, resource_size(lcdc_regs)); | 955 | release_mem_region(lcdc_regs->start, resource_size(lcdc_regs)); |
956 | 956 | ||
957 | } | 957 | } |
@@ -1171,7 +1171,7 @@ static int __devinit fb_probe(struct platform_device *device) | |||
1171 | if (!lcdc_regs) | 1171 | if (!lcdc_regs) |
1172 | return -EBUSY; | 1172 | return -EBUSY; |
1173 | 1173 | ||
1174 | da8xx_fb_reg_base = (resource_size_t)ioremap(lcdc_regs->start, len); | 1174 | da8xx_fb_reg_base = ioremap(lcdc_regs->start, len); |
1175 | if (!da8xx_fb_reg_base) { | 1175 | if (!da8xx_fb_reg_base) { |
1176 | ret = -EBUSY; | 1176 | ret = -EBUSY; |
1177 | goto err_request_mem; | 1177 | goto err_request_mem; |
@@ -1392,7 +1392,7 @@ err_clk_put: | |||
1392 | clk_put(fb_clk); | 1392 | clk_put(fb_clk); |
1393 | 1393 | ||
1394 | err_ioremap: | 1394 | err_ioremap: |
1395 | iounmap((void __iomem *)da8xx_fb_reg_base); | 1395 | iounmap(da8xx_fb_reg_base); |
1396 | 1396 | ||
1397 | err_request_mem: | 1397 | err_request_mem: |
1398 | release_mem_region(lcdc_regs->start, len); | 1398 | release_mem_region(lcdc_regs->start, len); |