fbdev: Add __iomem annotations to pm2fb
PATCH 10/15 fbdev: Add __iomem annotations to pm2fb
Add __iomem annotations to pm2fb
Signed-off-by Antonino Daplas <[email protected]>
--- pm2fb.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-)
drivers/video/pm2fb.c +10 -9
@@ -97,8 +97,8 @@ {pm2type_t type;/* Board type */ u32 fb_size;/* framebuffer memory size */ -unsigned char * v_fb;/* virtual address of frame buffer */ -unsigned char * v_regs;/* virtual address of p_regs */ +unsigned char __iomem *v_fb;/* virtual address of frame buffer */ +unsigned char __iomem *v_regs;/* virtual address of p_regs */ u32 memclock;/* memclock */ u32 video;/* video flags before blanking */ };
@@ -149,12 +149,12 @@* Utility functions */ -inline static u32 RD32 (unsigned char * base,s32 off) +inline static u32 RD32 (unsigned char __iomem *base,s32 off) {return fb_readl (base + off); } -inline static void WR32 (unsigned char * base,s32 off,u32 v) +inline static void WR32 (unsigned char __iomem *base,s32 off,u32 v) {fb_writel (v, base + off); }
@@ -1154,10 +1154,10 @@ err_exit_all:fb_dealloc_cmap (&info->cmap); err_exit_both: -iounmap ((void *) pm2fb_fix.smem_start); +iounmap (info->screen_base);release_mem_region (pm2fb_fix.smem_start, pm2fb_fix.smem_len); err_exit_mmio: -iounmap ((void *) pm2fb_fix.mmio_start); +iounmap (default_par->v_regs);release_mem_region (pm2fb_fix.mmio_start, pm2fb_fix.mmio_len); err_exit_neither:framebuffer_release (info);
@@ -1175,12 +1175,13 @@ {struct fb_info * info =pci_get_drvdata (pdev);struct fb_fix_screeninfo * fix = &info->fix; - +struct pm2fb_par *par = info->par; +unregister_framebuffer (info); -iounmap ((void *) fix->smem_start); +iounmap (info->screen_base);release_mem_region (fix->smem_start, fix->smem_len); -iounmap ((void *) fix->mmio_start); +iounmap (par->v_regs);release_mem_region (fix->mmio_start, fix->mmio_len);pci_set_drvdata (pdev,NULL );
-------------------------------------------------------
This Newsletter Sponsored by: Macrovision
For reliable Linux application installations, use the industry's leading setup authoring tool, InstallShield X. Learn more and evaluate today. http://clk.atdmt.com/MSI/go/ins0030000001msi/direct/01/