Commit 64225ac4 authored by Antonino Daplas's avatar Antonino Daplas Committed by Linus Torvalds

[PATCH] fbdev: Add __iomem annotations for savagefb

Add __iomem annotations for savagefb
Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 61c9562f
...@@ -1499,7 +1499,7 @@ static int __devinit savage_map_mmio (struct fb_info *info) ...@@ -1499,7 +1499,7 @@ static int __devinit savage_map_mmio (struct fb_info *info)
info->fix.mmio_start = par->mmio.pbase; info->fix.mmio_start = par->mmio.pbase;
info->fix.mmio_len = par->mmio.len; info->fix.mmio_len = par->mmio.len;
par->bci_base = (u32*)(par->mmio.vbase + BCI_BUFFER_OFFSET); par->bci_base = (u32 __iomem *)(par->mmio.vbase + BCI_BUFFER_OFFSET);
par->bci_ptr = 0; par->bci_ptr = 0;
savage_enable_mmio (par); savage_enable_mmio (par);
...@@ -1515,7 +1515,7 @@ static void __devinit savage_unmap_mmio (struct fb_info *info) ...@@ -1515,7 +1515,7 @@ static void __devinit savage_unmap_mmio (struct fb_info *info)
savage_disable_mmio(par); savage_disable_mmio(par);
if (par->mmio.vbase) { if (par->mmio.vbase) {
iounmap ((void *)par->mmio.vbase); iounmap ((void __iomem *)par->mmio.vbase);
par->mmio.vbase = NULL; par->mmio.vbase = NULL;
} }
} }
...@@ -1552,10 +1552,6 @@ static int __devinit savage_map_video (struct fb_info *info, ...@@ -1552,10 +1552,6 @@ static int __devinit savage_map_video (struct fb_info *info,
par->video.mtrr = mtrr_add (par->video.pbase, video_len, par->video.mtrr = mtrr_add (par->video.pbase, video_len,
MTRR_TYPE_WRCOMB, 1); MTRR_TYPE_WRCOMB, 1);
#endif #endif
/* Clear framebuffer, it's all white in memory after boot */
memset (par->video.vbase, 0, par->video.len);
return 0; return 0;
} }
......
...@@ -156,7 +156,7 @@ struct savagefb_i2c_chan { ...@@ -156,7 +156,7 @@ struct savagefb_i2c_chan {
struct savagefb_par *par; struct savagefb_par *par;
struct i2c_adapter adapter; struct i2c_adapter adapter;
struct i2c_algo_bit_data algo; struct i2c_algo_bit_data algo;
volatile u8 *ioaddr; volatile u8 __iomem *ioaddr;
u32 reg; u32 reg;
}; };
...@@ -172,7 +172,7 @@ struct savagefb_par { ...@@ -172,7 +172,7 @@ struct savagefb_par {
int numClocks; int numClocks;
int clock[4]; int clock[4];
struct { struct {
u8 *vbase; u8 __iomem *vbase;
u32 pbase; u32 pbase;
u32 len; u32 len;
#ifdef CONFIG_MTRR #ifdef CONFIG_MTRR
...@@ -181,12 +181,12 @@ struct savagefb_par { ...@@ -181,12 +181,12 @@ struct savagefb_par {
} video; } video;
struct { struct {
volatile u8 *vbase; volatile u8 __iomem *vbase;
u32 pbase; u32 pbase;
u32 len; u32 len;
} mmio; } mmio;
volatile u32 *bci_base; volatile u32 __iomem *bci_base;
unsigned int bci_ptr; unsigned int bci_ptr;
u32 cob_offset; u32 cob_offset;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment