diff options
author | Al Viro <viro@www.linux.org.uk> | 2005-04-26 10:43:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 10:43:41 -0400 |
commit | 0d3e8fe662c31d614f809d0131e134e2692d6a68 (patch) | |
tree | 1bcde202c5a93e3054aa09e185606ec932ac0623 | |
parent | 9727d04aa6d58e131128b4178e742c423480d476 (diff) |
[PATCH] savagefb iomem annotations
trivial iomem annotations + memset() replaced with memset_io() in a
place that deals with ioremapped area.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/video/savage/savagefb_driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c index 5bb8d60f35c4..03d74e8ee067 100644 --- a/drivers/video/savage/savagefb_driver.c +++ b/drivers/video/savage/savagefb_driver.c | |||
@@ -1498,7 +1498,7 @@ static int __devinit savage_map_mmio (struct fb_info *info) | |||
1498 | info->fix.mmio_start = par->mmio.pbase; | 1498 | info->fix.mmio_start = par->mmio.pbase; |
1499 | info->fix.mmio_len = par->mmio.len; | 1499 | info->fix.mmio_len = par->mmio.len; |
1500 | 1500 | ||
1501 | par->bci_base = (u32*)(par->mmio.vbase + BCI_BUFFER_OFFSET); | 1501 | par->bci_base = (u32 __iomem *)(par->mmio.vbase + BCI_BUFFER_OFFSET); |
1502 | par->bci_ptr = 0; | 1502 | par->bci_ptr = 0; |
1503 | 1503 | ||
1504 | savage_enable_mmio (par); | 1504 | savage_enable_mmio (par); |
@@ -1514,7 +1514,7 @@ static void __devinit savage_unmap_mmio (struct fb_info *info) | |||
1514 | savage_disable_mmio(par); | 1514 | savage_disable_mmio(par); |
1515 | 1515 | ||
1516 | if (par->mmio.vbase) { | 1516 | if (par->mmio.vbase) { |
1517 | iounmap ((void *)par->mmio.vbase); | 1517 | iounmap(par->mmio.vbase); |
1518 | par->mmio.vbase = NULL; | 1518 | par->mmio.vbase = NULL; |
1519 | } | 1519 | } |
1520 | } | 1520 | } |
@@ -1553,7 +1553,7 @@ static int __devinit savage_map_video (struct fb_info *info, | |||
1553 | #endif | 1553 | #endif |
1554 | 1554 | ||
1555 | /* Clear framebuffer, it's all white in memory after boot */ | 1555 | /* Clear framebuffer, it's all white in memory after boot */ |
1556 | memset (par->video.vbase, 0, par->video.len); | 1556 | memset_io (par->video.vbase, 0, par->video.len); |
1557 | 1557 | ||
1558 | return 0; | 1558 | return 0; |
1559 | } | 1559 | } |