9 files changed, 5 insertions, 189 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index bed9d58d5741..8b27ca054c59 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -297,13 +297,6 @@ config MTD_IXP4XX
           IXDP425 and Coyote. If you have an IXP4xx based board and
           would like to use the flash chips on it, say 'Y'.
 
-config MTD_AUTCPU12
-        bool "NV-RAM mapping AUTCPU12 board"
-        depends on ARCH_AUTCPU12
-        help
-          This enables access to the NV-RAM on autronix autcpu12 board.
-          If you have such a board, say 'Y'.
-
 config MTD_IMPA7
         tristate "JEDEC Flash device mapped on impA7"
         depends on ARM && MTD_JEDECPROBE
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 395a12444048..9fdbd4ba6441 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -32,7 +32,6 @@ obj-$(CONFIG_MTD_VMAX)		+= vmax301.o
 obj-$(CONFIG_MTD_SCx200_DOCFLASH)+= scx200_docflash.o
 obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
 obj-$(CONFIG_MTD_PCI)           += pci.o
-obj-$(CONFIG_MTD_AUTCPU12)      += autcpu12-nvram.o
 obj-$(CONFIG_MTD_IMPA7)         += impa7.o
 obj-$(CONFIG_MTD_UCLINUX)       += uclinux.o
 obj-$(CONFIG_MTD_NETtel)        += nettel.o
diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c
deleted file mode 100644
index c3525d2a2fa8..000000000000
--- a/drivers/mtd/maps/autcpu12-nvram.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * NV-RAM memory access on autcpu12
- * (C) 2002 Thomas Gleixner (gleixner@autronix.de)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#include <linux/err.h>
-#include <linux/sizes.h>
-
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-
-struct autcpu12_nvram_priv {
-        struct mtd_info *mtd;
-        struct map_info map;
-};
-
-static int autcpu12_nvram_probe(struct platform_device *pdev)
-{
-        map_word tmp, save0, save1;
-        struct resource *res;
-        struct autcpu12_nvram_priv *priv;
-
-        priv = devm_kzalloc(&pdev->dev,
-                            sizeof(struct autcpu12_nvram_priv), GFP_KERNEL);
-        if (!priv)
-                return -ENOMEM;
-
-        platform_set_drvdata(pdev, priv);
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                dev_err(&pdev->dev, "failed to get memory resource\n");
-                return -ENOENT;
-        }
-
-        priv->map.bankwidth     = 4;
-        priv->map.phys          = res->start;
-        priv->map.size          = resource_size(res);
-        priv->map.virt = devm_ioremap_resource(&pdev->dev, res);
-        strcpy((char *)priv->map.name, res->name);
-        if (IS_ERR(priv->map.virt))
-                return PTR_ERR(priv->map.virt);
-
-        simple_map_init(&priv->map);
-
-        /*
-         * Check for 32K/128K
-         * read ofs 0
-         * read ofs 0x10000
-         * Write complement to ofs 0x100000
-         * Read and check result on ofs 0x0
-         * Restore contents
-         */
-        save0 = map_read(&priv->map, 0);
-        save1 = map_read(&priv->map, 0x10000);
-        tmp.x[0] = ~save0.x[0];
-        map_write(&priv->map, tmp, 0x10000);
-        tmp = map_read(&priv->map, 0);
-        /* if we find this pattern on 0x0, we have 32K size */
-        if (!map_word_equal(&priv->map, tmp, save0)) {
-                map_write(&priv->map, save0, 0x0);
-                priv->map.size = SZ_32K;
-        } else
-                map_write(&priv->map, save1, 0x10000);
-
-        priv->mtd = do_map_probe("map_ram", &priv->map);
-        if (!priv->mtd) {
-                dev_err(&pdev->dev, "probing failed\n");
-                return -ENXIO;
-        }
-
-        priv->mtd->owner        = THIS_MODULE;
-        priv->mtd->erasesize    = 16;
-        priv->mtd->dev.parent   = &pdev->dev;
-        if (!mtd_device_register(priv->mtd, NULL, 0)) {
-                dev_info(&pdev->dev,
-                         "NV-RAM device size %ldKiB registered on AUTCPU12\n",
-                         priv->map.size / SZ_1K);
-                return 0;
-        }
-
-        map_destroy(priv->mtd);
-        dev_err(&pdev->dev, "NV-RAM device addition failed\n");
-        return -ENOMEM;
-}
-
-static int autcpu12_nvram_remove(struct platform_device *pdev)
-{
-        struct autcpu12_nvram_priv *priv = platform_get_drvdata(pdev);
-
-        mtd_device_unregister(priv->mtd);
-        map_destroy(priv->mtd);
-
-        return 0;
-}
-
-static struct platform_driver autcpu12_nvram_driver = {
-        .driver         = {
-                .name   = "autcpu12_nvram",
-                .owner  = THIS_MODULE,
-        },
-        .probe          = autcpu12_nvram_probe,
-        .remove         = autcpu12_nvram_remove,
-};
-module_platform_driver(autcpu12_nvram_driver);
-
-MODULE_AUTHOR("Thomas Gleixner");
-MODULE_DESCRIPTION("autcpu12 NVRAM map driver");
-MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index c719879284bd..684bfa39e4ee 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -55,25 +55,7 @@ struct mtd_file_info {
 static loff_t mtdchar_lseek(struct file *file, loff_t offset, int orig)
 {
         struct mtd_file_info *mfi = file->private_data;
-        struct mtd_info *mtd = mfi->mtd;
-
-        switch (orig) {
-        case SEEK_SET:
-                break;
-        case SEEK_CUR:
-                offset += file->f_pos;
-                break;
-        case SEEK_END:
-                offset += mtd->size;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        if (offset >= 0 && offset <= mtd->size)
-                return file->f_pos = offset;
-
-        return -EINVAL;
+        return fixed_size_llseek(file, offset, orig, mfi->mtd->size);
 }
 
 static int count;
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index c400c57c394a..048c823f5c51 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -1151,7 +1151,7 @@ static int __init mtd_bdi_init(struct backing_dev_info *bdi, const char *name)
 
         ret = bdi_init(bdi);
         if (!ret)
-                ret = bdi_register(bdi, NULL, name);
+                ret = bdi_register(bdi, NULL, "%s", name);
 
         if (ret)
                 bdi_destroy(bdi);
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index a60f6c17f57b..50543f166215 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -95,7 +95,7 @@ config MTD_NAND_OMAP2
 
 config MTD_NAND_OMAP_BCH
         depends on MTD_NAND && MTD_NAND_OMAP2 && ARCH_OMAP3
-        bool "Enable support for hardware BCH error correction"
+        tristate "Enable support for hardware BCH error correction"
         default n
         select BCH
         select BCH_CONST_PARAMS
diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index a94facb46e5c..fd1df5e13ae4 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -672,11 +672,6 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
         }
 
         rc = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (rc == NULL) {
-                dev_err(&pdev->dev, "No memory resource found for device!\r\n");
-                return -ENXIO;
-        }
-
         host->io_base = devm_ioremap_resource(&pdev->dev, rc);
         if (IS_ERR(host->io_base))
                 return PTR_ERR(host->io_base);
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index a3503821d0c7..315dcc6ec1f5 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -1006,7 +1006,7 @@ int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num,
         if (err)
                 goto out_uif;
 
-        ubi->bgt_thread = kthread_create(ubi_thread, ubi, ubi->bgt_name);
+        ubi->bgt_thread = kthread_create(ubi_thread, ubi, "%s", ubi->bgt_name);
         if (IS_ERR(ubi->bgt_thread)) {
                 err = PTR_ERR(ubi->bgt_thread);
                 ubi_err("cannot spawn \"%s\", error %d", ubi->bgt_name,
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index 4f02848bb2bc..8ca49f2043e4 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -155,7 +155,6 @@ static loff_t vol_cdev_llseek(struct file *file, loff_t offset, int origin)
 {
         struct ubi_volume_desc *desc = file->private_data;
         struct ubi_volume *vol = desc->vol;
-        loff_t new_offset;
 
         if (vol->updating) {
                 /* Update is in progress, seeking is prohibited */
@@ -163,30 +162,7 @@ static loff_t vol_cdev_llseek(struct file *file, loff_t offset, int origin)
                 return -EBUSY;
         }
 
-        switch (origin) {
-        case 0: /* SEEK_SET */
-                new_offset = offset;
-                break;
-        case 1: /* SEEK_CUR */
-                new_offset = file->f_pos + offset;
-                break;
-        case 2: /* SEEK_END */
-                new_offset = vol->used_bytes + offset;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        if (new_offset < 0 || new_offset > vol->used_bytes) {
-                ubi_err("bad seek %lld", new_offset);
-                return -EINVAL;
-        }
-
-        dbg_gen("seek volume %d, offset %lld, origin %d, new offset %lld",
-                vol->vol_id, offset, origin, new_offset);
-
-        file->f_pos = new_offset;
-        return new_offset;
+        return fixed_size_llseek(file, offset, origin, vol->used_bytes);
 }
 
 static int vol_cdev_fsync(struct file *file, loff_t start, loff_t end,