1 files changed, 29 insertions, 31 deletions

diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c
index f68f7a99a630..9848eb09b884 100644
--- a/drivers/mtd/nand/h1910.c
+++ b/drivers/mtd/nand/h1910.c
@@ -4,7 +4,7 @@
  *  Copyright (C) 2003 Joshua Wise (joshua@joshuawise.com)
  *
  *  Derived from drivers/mtd/nand/edb7312.c
- *       Copyright (C) 2002 Marius Gr๖ger (mag@sysgo.de)
+ *       Copyright (C) 2002 Marius Grรถger (mag@sysgo.de)
  *       Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
  *
  * $Id: h1910.c,v 1.6 2005/11/07 11:14:30 gleixner Exp $
@@ -26,7 +26,7 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h> /* for CLPS7111_VIRT_BASE */
+#include <asm/arch/hardware.h>  /* for CLPS7111_VIRT_BASE */
 #include <asm/sizes.h>
 #include <asm/arch/h1900-gpio.h>
 #include <asm/arch/ipaq.h>
@@ -45,23 +45,23 @@ static struct mtd_info *h1910_nand_mtd = NULL;
  * Define static partitions for flash device
  */
 static struct mtd_partition partition_info[] = {
-        { name: "h1910 NAND Flash",
-                  offset: 0,
-                  size: 16*1024*1024 }
+      {name:"h1910 NAND Flash",
+              offset:0,
+      size:16 * 1024 * 1024}
 };
+
 #define NUM_PARTITIONS 1
 
 #endif
 
-
 /*
  *      hardware specific access to control-lines
  */
 static void h1910_hwcontrol(struct mtd_info *mtd, int cmd)
 {
-        struct nand_chip* this = (struct nand_chip *) (mtd->priv);
+        struct nand_chip *this = (struct nand_chip *)(mtd->priv);
 
-        switch(cmd) {
+        switch (cmd) {
 
         case NAND_CTL_SETCLE:
                 this->IO_ADDR_R |= (1 << 2);
@@ -101,7 +101,7 @@ static int h1910_device_ready(struct mtd_info *mtd)
 /*
  * Main initialization routine
  */
-static int __init h1910_init (void)
+static int __init h1910_init(void)
 {
         struct nand_chip *this;
         const char *part_type = 0;
@@ -119,24 +119,23 @@ static int __init h1910_init (void)
         }
 
         /* Allocate memory for MTD device structure and private data */
-        h1910_nand_mtd = kmalloc(sizeof(struct mtd_info) +
-                             sizeof(struct nand_chip),
-                             GFP_KERNEL);
+        h1910_nand_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);
         if (!h1910_nand_mtd) {
                 printk("Unable to allocate h1910 NAND MTD device structure.\n");
-                iounmap ((void *) nandaddr);
+                iounmap((void *)nandaddr);
                 return -ENOMEM;
         }
 
         /* Get pointer to private data */
-        this = (struct nand_chip *) (&h1910_nand_mtd[1]);
+        this = (struct nand_chip *)(&h1910_nand_mtd[1]);
 
         /* Initialize structures */
-        memset((char *) h1910_nand_mtd, 0, sizeof(struct mtd_info));
-        memset((char *) this, 0, sizeof(struct nand_chip));
+        memset(h1910_nand_mtd, 0, sizeof(struct mtd_info));
+        memset(this, 0, sizeof(struct nand_chip));
 
         /* Link the private data with the MTD structure */
         h1910_nand_mtd->priv = this;
+        h1910_nand_mtd->owner = THIS_MODULE;
 
         /*
          * Enable VPEN
@@ -154,23 +153,20 @@ static int __init h1910_init (void)
         this->options = NAND_NO_AUTOINCR;
 
         /* Scan to find existence of the device */
-        if (nand_scan (h1910_nand_mtd, 1)) {
+        if (nand_scan(h1910_nand_mtd, 1)) {
                 printk(KERN_NOTICE "No NAND device - returning -ENXIO\n");
-                kfree (h1910_nand_mtd);
-                iounmap ((void *) nandaddr);
+                kfree(h1910_nand_mtd);
+                iounmap((void *)nandaddr);
                 return -ENXIO;
         }
-
 #ifdef CONFIG_MTD_CMDLINE_PARTS
-        mtd_parts_nb = parse_cmdline_partitions(h1910_nand_mtd, &mtd_parts,
-                                                "h1910-nand");
+        mtd_parts_nb = parse_cmdline_partitions(h1910_nand_mtd, &mtd_parts, "h1910-nand");
         if (mtd_parts_nb > 0)
-          part_type = "command line";
+                part_type = "command line";
         else
-          mtd_parts_nb = 0;
+                mtd_parts_nb = 0;
 #endif
-        if (mtd_parts_nb == 0)
-        {
+        if (mtd_parts_nb == 0) {
                 mtd_parts = partition_info;
                 mtd_parts_nb = NUM_PARTITIONS;
                 part_type = "static";
@@ -183,24 +179,26 @@ static int __init h1910_init (void)
         /* Return happy */
         return 0;
 }
+
 module_init(h1910_init);
 
 /*
  * Clean up routine
  */
-static void __exit h1910_cleanup (void)
+static void __exit h1910_cleanup(void)
 {
-        struct nand_chip *this = (struct nand_chip *) &h1910_nand_mtd[1];
+        struct nand_chip *this = (struct nand_chip *)&h1910_nand_mtd[1];
 
         /* Release resources, unregister device */
-        nand_release (h1910_nand_mtd);
+        nand_release(h1910_nand_mtd);
 
         /* Release io resource */
-        iounmap ((void *) this->IO_ADDR_W);
+        iounmap((void *)this->IO_ADDR_W);
 
         /* Free the MTD device structure */
-        kfree (h1910_nand_mtd);
+        kfree(h1910_nand_mtd);
 }
+
 module_exit(h1910_cleanup);
 
 MODULE_LICENSE("GPL");