diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2007-10-04 12:48:37 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2007-10-10 11:14:34 -0400 |
commit | b9a22794f2c186b5722eac94b6735e797d976027 (patch) | |
tree | 7694e303bd00f3236bcb20f6b884d8cedcf9be87 | |
parent | e3cec00366e9d60ff65c6f6f8fffdfcadea01056 (diff) |
[POWERPC] XilinxFB: sparse fixes
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r-- | drivers/video/xilinxfb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c index e6e12be845a9..dec602c23075 100644 --- a/drivers/video/xilinxfb.c +++ b/drivers/video/xilinxfb.c | |||
@@ -118,7 +118,7 @@ struct xilinxfb_drvdata { | |||
118 | u32 regs_phys; /* phys. address of the control registers */ | 118 | u32 regs_phys; /* phys. address of the control registers */ |
119 | u32 __iomem *regs; /* virt. address of the control registers */ | 119 | u32 __iomem *regs; /* virt. address of the control registers */ |
120 | 120 | ||
121 | unsigned char __iomem *fb_virt; /* virt. address of the frame buffer */ | 121 | void *fb_virt; /* virt. address of the frame buffer */ |
122 | dma_addr_t fb_phys; /* phys. address of the frame buffer */ | 122 | dma_addr_t fb_phys; /* phys. address of the frame buffer */ |
123 | 123 | ||
124 | u32 reg_ctrl_default; | 124 | u32 reg_ctrl_default; |
@@ -246,7 +246,7 @@ static int xilinxfb_assign(struct device *dev, unsigned long physaddr, | |||
246 | } | 246 | } |
247 | 247 | ||
248 | /* Clear (turn to black) the framebuffer */ | 248 | /* Clear (turn to black) the framebuffer */ |
249 | memset_io(drvdata->fb_virt, 0, FB_SIZE); | 249 | memset_io((void __iomem *)drvdata->fb_virt, 0, FB_SIZE); |
250 | 250 | ||
251 | /* Tell the hardware where the frame buffer is */ | 251 | /* Tell the hardware where the frame buffer is */ |
252 | xilinx_fb_out_be32(drvdata, REG_FB_ADDR, drvdata->fb_phys); | 252 | xilinx_fb_out_be32(drvdata, REG_FB_ADDR, drvdata->fb_phys); |
@@ -259,7 +259,7 @@ static int xilinxfb_assign(struct device *dev, unsigned long physaddr, | |||
259 | 259 | ||
260 | /* Fill struct fb_info */ | 260 | /* Fill struct fb_info */ |
261 | drvdata->info.device = dev; | 261 | drvdata->info.device = dev; |
262 | drvdata->info.screen_base = drvdata->fb_virt; | 262 | drvdata->info.screen_base = (void __iomem *)drvdata->fb_virt; |
263 | drvdata->info.fbops = &xilinxfb_ops; | 263 | drvdata->info.fbops = &xilinxfb_ops; |
264 | drvdata->info.fix = xilinx_fb_fix; | 264 | drvdata->info.fix = xilinx_fb_fix; |
265 | drvdata->info.fix.smem_start = drvdata->fb_phys; | 265 | drvdata->info.fix.smem_start = drvdata->fb_phys; |