vserver 1.9.5.x5

[linux-2.6.git] / drivers / mtd / nand / spia.c

diff --git a/drivers/mtd/nand/spia.c b/drivers/mtd/nand/spia.c
index e5e25eb..b777c41 100644 (file)
--- a/drivers/mtd/nand/spia.c
+++ b/drivers/mtd/nand/spia.c
@@ -8,7 +8,7 @@
  *                     to controllines (due to change in nand.c)
  *                     page_cache added
  *
- * $Id: spia.c,v 1.19 2003/04/20 07:24:40 gleixner Exp $
+ * $Id: spia.c,v 1.24 2004/11/04 12:53:10 gleixner Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -20,6 +20,8 @@
  *   a 64Mibit (8MiB x 8 bits) NAND flash device.
  */
 
+#include <linux/kernel.h>
+#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
@@ -35,14 +37,14 @@ static struct mtd_info *spia_mtd = NULL;
 /*
  * Values specific to the SPIA board (used with EP7212 processor)
  */
-#define SPIA_IO_ADDR   = 0xd0000000    /* Start of EP7212 IO address space */
-#define SPIA_FIO_ADDR  = 0xf0000000    /* Address where flash is mapped */
-#define SPIA_PEDR      = 0x0080        /*
+#define SPIA_IO_BASE   0xd0000000      /* Start of EP7212 IO address space */
+#define SPIA_FIO_BASE  0xf0000000      /* Address where flash is mapped */
+#define SPIA_PEDR      0x0080          /*
                                         * IO offset to Port E data register
                                         * where the CLE, ALE and NCE pins
                                         * are wired to.
                                         */
-#define SPIA_PEDDR     = 0x00c0        /*
+#define SPIA_PEDDR     0x00c0          /*
                                         * IO offset to Port E data direction
                                         * register so we can control the IO
                                         * lines.
@@ -57,15 +59,10 @@ static int spia_fio_base = SPIA_FIO_BASE;
 static int spia_pedr = SPIA_PEDR;
 static int spia_peddr = SPIA_PEDDR;
 
-MODULE_PARM(spia_io_base, "i");
-MODULE_PARM(spia_fio_base, "i");
-MODULE_PARM(spia_pedr, "i");
-MODULE_PARM(spia_peddr, "i");
-
-__setup("spia_io_base=",spia_io_base);
-__setup("spia_fio_base=",spia_fio_base);
-__setup("spia_pedr=",spia_pedr);
-__setup("spia_peddr=",spia_peddr);
+module_param(spia_io_base, int, 0);
+module_param(spia_fio_base, int, 0);
+module_param(spia_pedr, int, 0);
+module_param(spia_peddr, int, 0);
 
 /*
  * Define partitions for flash device
@@ -88,7 +85,7 @@ const static struct mtd_partition partition_info[] = {
 /* 
  *     hardware specific access to control-lines
 */
-void spia_hwcontrol(int cmd){
+static void spia_hwcontrol(struct mtd_info *mtd, int cmd){
 
     switch(cmd){
 
@@ -135,27 +132,19 @@ int __init spia_init (void)
        (*(volatile unsigned char *) (spia_io_base + spia_peddr)) = 0x07;
 
        /* Set address of NAND IO lines */
-       this->IO_ADDR_R = spia_fio_base;
-       this->IO_ADDR_W = spia_fio_base;
+       this->IO_ADDR_R = (void __iomem *) spia_fio_base;
+       this->IO_ADDR_W = (void __iomem *) spia_fio_base;
        /* Set address of hardware control function */
        this->hwcontrol = spia_hwcontrol;
        /* 15 us command delay time */
        this->chip_delay = 15;          
 
        /* Scan to find existence of the device */
-       if (nand_scan (spia_mtd)) {
+       if (nand_scan (spia_mtd, 1)) {
                kfree (spia_mtd);
                return -ENXIO;
        }
 
-       /* Allocate memory for internal data buffer */
-       this->data_buf = kmalloc (sizeof(u_char) * (spia_mtd->oobblock + spia_mtd->oobsize), GFP_KERNEL);
-       if (!this->data_buf) {
-               printk ("Unable to allocate NAND data buffer for SPIA.\n");
-               kfree (spia_mtd);
-               return -ENOMEM;
-       }
-
        /* Register the partitions */
        add_mtd_partitions(spia_mtd, partition_info, NUM_PARTITIONS);
 
@@ -170,13 +159,8 @@ module_init(spia_init);
 #ifdef MODULE
 static void __exit spia_cleanup (void)
 {
-       struct nand_chip *this = (struct nand_chip *) &spia_mtd[1];
-
-       /* Unregister the device */
-       del_mtd_device (spia_mtd);
-
-       /* Free internal data buffer */
-       kfree (this->data_buf);
+       /* Release resources, unregister device */
+       nand_release (spia_mtd);
 
        /* Free the MTD device structure */
        kfree (spia_mtd);