Merge ../linus

10 files changed, 17 insertions, 17 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 24747bdc3e19..d132ed571f13 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -607,7 +607,7 @@ config MTD_BAST_MAXSIZE
         default "4"
 
 config MTD_SHARP_SL
-        bool "ROM maped on Sharp SL Series"
+        bool "ROM mapped on Sharp SL Series"
         depends on MTD && ARCH_PXA
         help
           This enables access to the flash chip on the Sharp SL Series of PDAs.
diff --git a/drivers/mtd/maps/arctic-mtd.c b/drivers/mtd/maps/arctic-mtd.c
index 642d96bc8919..2cc902436275 100644
--- a/drivers/mtd/maps/arctic-mtd.c
+++ b/drivers/mtd/maps/arctic-mtd.c
@@ -96,7 +96,7 @@ static struct mtd_partition arctic_partitions[PARTITIONS] = {
 static int __init
 init_arctic_mtd(void)
 {
-        int err = 0;
+        int err;
 
         printk("%s: 0x%08x at 0x%08x\n", NAME, SIZE, PADDR);
 
@@ -112,7 +112,7 @@ init_arctic_mtd(void)
         arctic_mtd = do_map_probe("cfi_probe", &arctic_mtd_map);
 
         if (!arctic_mtd) {
-                iounmap((void *) arctic_mtd_map.virt);
+                iounmap(arctic_mtd_map.virt);
                 return -ENXIO;
         }
 
@@ -121,7 +121,7 @@ init_arctic_mtd(void)
         err = add_mtd_partitions(arctic_mtd, arctic_partitions, PARTITIONS);
         if (err) {
                 printk("%s: add_mtd_partitions failed\n", NAME);
-                iounmap((void *) arctic_mtd_map.virt);
+                iounmap(arctic_mtd_map.virt);
         }
 
         return err;
diff --git a/drivers/mtd/maps/bast-flash.c b/drivers/mtd/maps/bast-flash.c
index 51f962dd7e31..e074bb6787d2 100644
--- a/drivers/mtd/maps/bast-flash.c
+++ b/drivers/mtd/maps/bast-flash.c
@@ -1,4 +1,4 @@
-/* linux/drivers/mtd/maps/bast_flash.c
+/* linux/drivers/mtd/maps/bast-flash.c
  *
  * Copyright (c) 2004-2005 Simtec Electronics
  *      Ben Dooks <ben@simtec.co.uk>
diff --git a/drivers/mtd/maps/beech-mtd.c b/drivers/mtd/maps/beech-mtd.c
index a64b1a5ab316..d76d5981b863 100644
--- a/drivers/mtd/maps/beech-mtd.c
+++ b/drivers/mtd/maps/beech-mtd.c
@@ -72,7 +72,7 @@ static struct mtd_partition beech_partitions[2] = {
 static int __init
 init_beech_mtd(void)
 {
-        int err = 0;
+        int err;
 
         printk("%s: 0x%08x at 0x%08x\n", NAME, SIZE, PADDR);
 
@@ -89,7 +89,7 @@ init_beech_mtd(void)
         beech_mtd = do_map_probe("cfi_probe", &beech_mtd_map);
 
         if (!beech_mtd) {
-                iounmap((void *) beech_mtd_map.virt);
+                iounmap(beech_mtd_map.virt);
                 return -ENXIO;
         }
 
@@ -98,7 +98,7 @@ init_beech_mtd(void)
         err = add_mtd_partitions(beech_mtd, beech_partitions, 2);
         if (err) {
                 printk("%s: add_mtd_partitions failed\n", NAME);
-                iounmap((void *) beech_mtd_map.virt);
+                iounmap(beech_mtd_map.virt);
         }
 
         return err;
diff --git a/drivers/mtd/maps/cfi_flagadm.c b/drivers/mtd/maps/cfi_flagadm.c
index 92b5d883d7b0..65e5ee552010 100644
--- a/drivers/mtd/maps/cfi_flagadm.c
+++ b/drivers/mtd/maps/cfi_flagadm.c
@@ -80,7 +80,7 @@ struct mtd_partition flagadm_parts[] = {
                 .size =         FLASH_PARTITION2_SIZE
         },
         {
-                .name =         "Persistant storage",
+                .name =         "Persistent storage",
                 .offset =       FLASH_PARTITION3_ADDR,
                 .size =         FLASH_PARTITION3_SIZE
         }
diff --git a/drivers/mtd/maps/cstm_mips_ixx.c b/drivers/mtd/maps/cstm_mips_ixx.c
index d6bef100d69a..df2c38ef105a 100644
--- a/drivers/mtd/maps/cstm_mips_ixx.c
+++ b/drivers/mtd/maps/cstm_mips_ixx.c
@@ -175,8 +175,8 @@ int __init init_cstm_mips_ixx(void)
                         printk(KERN_WARNING "Failed to ioremap\n");
                         for (j = 0; j < i; j++) {
                                 if (cstm_mips_ixx_map[j].virt) {
-                                        iounmap((void *)cstm_mips_ixx_map[j].virt);
-                                        cstm_mips_ixx_map[j].virt = 0;
+                                        iounmap(cstm_mips_ixx_map[j].virt);
+                                        cstm_mips_ixx_map[j].virt = NULL;
                                 }
                         }
                         return -EIO;
@@ -214,8 +214,8 @@ int __init init_cstm_mips_ixx(void)
                 else {
                         for (i = 0; i < PHYSMAP_NUMBER; i++) {
                                 if (cstm_mips_ixx_map[i].virt) {
-                                        iounmap((void *)cstm_mips_ixx_map[i].virt);
-                                        cstm_mips_ixx_map[i].virt = 0;
+                                        iounmap(cstm_mips_ixx_map[i].virt);
+                                        cstm_mips_ixx_map[i].virt = NULL;
                                 }
                         }
                         return -ENXIO;
diff --git a/drivers/mtd/maps/dmv182.c b/drivers/mtd/maps/dmv182.c
index a43c49905cac..e0558b0b2fe6 100644
--- a/drivers/mtd/maps/dmv182.c
+++ b/drivers/mtd/maps/dmv182.c
@@ -1,6 +1,6 @@
 
 /*
- * drivers/mtd/maps/svme182.c
+ * drivers/mtd/maps/dmv182.c
  *
  * Flash map driver for the Dy4 SVME182 board
  *
diff --git a/drivers/mtd/maps/nettel.c b/drivers/mtd/maps/nettel.c
index 198e840ff6db..f9e8e5bcbc33 100644
--- a/drivers/mtd/maps/nettel.c
+++ b/drivers/mtd/maps/nettel.c
@@ -463,7 +463,7 @@ int __init nettel_init(void)
 
 #ifdef CONFIG_MTD_CFI_INTELEXT
 out_unmap1:
-        iounmap((void *) nettel_intel_map.virt);
+        iounmap(nettel_intel_map.virt);
 #endif
 
 out_unmap2:
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index bc7cc71788bc..d1717763f719 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -62,7 +62,7 @@ static int physmap_flash_remove(struct platform_device *dev)
         }
 
         if (info->map.virt != NULL)
-                iounmap((void *)info->map.virt);
+                iounmap(info->map.virt);
 
         if (info->res != NULL) {
                 release_resource(info->res);
diff --git a/drivers/mtd/maps/redwood.c b/drivers/mtd/maps/redwood.c
index 2257d2b500c0..4d858b3d5f82 100644
--- a/drivers/mtd/maps/redwood.c
+++ b/drivers/mtd/maps/redwood.c
@@ -126,7 +126,7 @@ static struct mtd_info *redwood_mtd;
 
 int __init init_redwood_flash(void)
 {
-        int err = 0;
+        int err;
 
         printk(KERN_NOTICE "redwood: flash mapping: %x at %x\n",
                         WINDOW_SIZE, WINDOW_ADDR);