Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / mtd / maps / ocelot.c

diff --git a/drivers/mtd/maps/ocelot.c b/drivers/mtd/maps/ocelot.c
index 40c524d..6977963 100644 (file)
--- a/drivers/mtd/maps/ocelot.c
+++ b/drivers/mtd/maps/ocelot.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ocelot.c,v 1.13 2004/07/12 21:59:44 dwmw2 Exp $
+ * $Id: ocelot.c,v 1.17 2005/11/07 11:14:27 gleixner Exp $
  *
  * Flash on Momenco Ocelot
  */
@@ -28,10 +28,10 @@ static struct mtd_info *nvram_mtd;
 
 static void ocelot_ram_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf)
 {
-        struct map_info *map = (struct map_info *)mtd->priv;
+        struct map_info *map = mtd->priv;
        size_t done = 0;
 
-       /* If we use memcpy, it does word-wide writes. Even though we told the 
+       /* If we use memcpy, it does word-wide writes. Even though we told the
           GT64120A that it's an 8-bit wide region, word-wide writes don't work.
           We end up just writing the first byte of the four to all four bytes.
           So we have this loop instead */
@@ -68,7 +68,7 @@ static int __init init_ocelot_maps(void)
        int nr_parts;
        unsigned char brd_status;
 
-               printk(KERN_INFO "Momenco Ocelot MTD mappings: Flash 0x%x at 0x%x, NVRAM 0x%x at 0x%x\n", 
+               printk(KERN_INFO "Momenco Ocelot MTD mappings: Flash 0x%x at 0x%x, NVRAM 0x%x at 0x%x\n",
               FLASH_WINDOW_SIZE, FLASH_WINDOW_ADDR, NVRAM_WINDOW_SIZE, NVRAM_WINDOW_ADDR);
 
        /* First check whether the flash jumper is present */
@@ -81,7 +81,7 @@ static int __init init_ocelot_maps(void)
        iounmap(pld);
 
        /* Now ioremap the NVRAM space */
-       ocelot_nvram_map.virt = (unsigned long)ioremap_nocache(NVRAM_WINDOW_ADDR, NVRAM_WINDOW_SIZE);
+       ocelot_nvram_map.virt = ioremap_nocache(NVRAM_WINDOW_ADDR, NVRAM_WINDOW_SIZE);
        if (!ocelot_nvram_map.virt) {
                printk(KERN_NOTICE "Failed to ioremap Ocelot NVRAM space\n");
                return -EIO;
@@ -101,7 +101,7 @@ static int __init init_ocelot_maps(void)
        nvram_mtd->write = ocelot_ram_write;
 
        /* Now map the flash space */
-       ocelot_flash_map.virt = (unsigned long)ioremap_nocache(FLASH_WINDOW_ADDR, FLASH_WINDOW_SIZE);
+       ocelot_flash_map.virt = ioremap_nocache(FLASH_WINDOW_ADDR, FLASH_WINDOW_SIZE);
        if (!ocelot_flash_map.virt) {
                printk(KERN_NOTICE "Failed to ioremap Ocelot flash space\n");
                goto fail_2;
@@ -138,8 +138,8 @@ static int __init init_ocelot_maps(void)
                add_mtd_device(flash_mtd);
 
        return 0;
-       
- fail3:        
+
+ fail3:
        iounmap((void *)ocelot_flash_map.virt);
        if (ocelot_flash_map.cached)
                        iounmap((void *)ocelot_flash_map.cached);