28 files changed, 140 insertions, 214 deletions

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 4dd3b38ddac0..557bec599f4f 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -291,7 +291,7 @@ config SSFDC
 
 config SM_FTL
         tristate "SmartMedia/xD new translation layer"
-        depends on EXPERIMENTAL && BLOCK
+        depends on BLOCK
         select MTD_BLKDEVS
         select MTD_NAND_ECC
         help
diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
index 9bcec8f22bbb..63feb75cc8e0 100644
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -14,7 +14,7 @@
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <asm/mach-bcm47xx/nvram.h>
+#include <bcm47xx_nvram.h>
 
 /* 10 parts were found on sflash on Netgear WNDR4500 */
 #define BCM47XXPART_MAX_PARTS           12
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index e469b01d40d2..c219e3d098d9 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -225,7 +225,7 @@ config MTD_ABSENT
 
 config MTD_XIP
         bool "XIP aware MTD support"
-        depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL && ARCH_MTD_XIP
+        depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && ARCH_MTD_XIP
         default y if XIP_KERNEL
         help
           This allows MTD support to work with flash memory which is also
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index 46dcb54c32ec..12311f506ca1 100644
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -52,7 +52,7 @@ config MTD_MS02NV
 
 config MTD_DATAFLASH
         tristate "Support for AT45xxx DataFlash"
-        depends on SPI_MASTER && EXPERIMENTAL
+        depends on SPI_MASTER
         help
           This enables access to AT45xxx DataFlash chips, using SPI.
           Sometimes DataFlash chips are packaged inside MMC-format
@@ -81,7 +81,7 @@ config MTD_DATAFLASH_OTP
 
 config MTD_M25P80
         tristate "Support most SPI Flash chips (AT26DF, M25P, W25X, ...)"
-        depends on SPI_MASTER && EXPERIMENTAL
+        depends on SPI_MASTER
         help
           This enables access to most modern SPI flash chips, used for
           program and data storage.   Series supported include Atmel AT26DF,
diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index 2aabd96bf0ff..8a82b8bc21e1 100644
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -949,10 +949,9 @@ static int spear_smi_probe(struct platform_device *pdev)
 
         smi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-        dev->io_base = devm_request_and_ioremap(&pdev->dev, smi_base);
-        if (!dev->io_base) {
-                ret = -EIO;
-                dev_err(&pdev->dev, "devm_request_and_ioremap fail\n");
+        dev->io_base = devm_ioremap_resource(&pdev->dev, smi_base);
+        if (IS_ERR(dev->io_base)) {
+                ret = PTR_ERR(dev->io_base);
                 goto err;
         }
 
diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c
index a2dc2ae4b24e..c3525d2a2fa8 100644
--- a/drivers/mtd/maps/autcpu12-nvram.c
+++ b/drivers/mtd/maps/autcpu12-nvram.c
@@ -16,6 +16,7 @@
  * 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>
@@ -55,12 +56,10 @@ static int autcpu12_nvram_probe(struct platform_device *pdev)
         priv->map.bankwidth     = 4;
         priv->map.phys          = res->start;
         priv->map.size          = resource_size(res);
-        priv->map.virt          = devm_request_and_ioremap(&pdev->dev, res);
+        priv->map.virt = devm_ioremap_resource(&pdev->dev, res);
         strcpy((char *)priv->map.name, res->name);
-        if (!priv->map.virt) {
-                dev_err(&pdev->dev, "failed to remap mem resource\n");
-                return -EBUSY;
-        }
+        if (IS_ERR(priv->map.virt))
+                return PTR_ERR(priv->map.virt);
 
         simple_map_init(&priv->map);
 
diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index 3c3c791eb96a..d1da6ede3845 100644
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -7,6 +7,7 @@
  *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
  */
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -136,10 +137,9 @@ ltq_mtd_probe(struct platform_device *pdev)
         ltq_mtd->map = kzalloc(sizeof(struct map_info), GFP_KERNEL);
         ltq_mtd->map->phys = ltq_mtd->res->start;
         ltq_mtd->map->size = resource_size(ltq_mtd->res);
-        ltq_mtd->map->virt = devm_request_and_ioremap(&pdev->dev, ltq_mtd->res);
-        if (!ltq_mtd->map->virt) {
-                dev_err(&pdev->dev, "failed to remap mem resource\n");
-                err = -EBUSY;
+        ltq_mtd->map->virt = devm_ioremap_resource(&pdev->dev, ltq_mtd->res);
+        if (IS_ERR(ltq_mtd->map->virt)) {
+                err = PTR_ERR(ltq_mtd->map->virt);
                 goto err_out;
         }
 
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 500d7f4f8028..363939dfad05 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -167,7 +167,7 @@ static int of_flash_probe(struct platform_device *dev)
         resource_size_t res_size;
         struct mtd_part_parser_data ppdata;
         bool map_indirect;
-        const char *mtd_name;
+        const char *mtd_name = NULL;
 
         match = of_match_device(of_flash_match, &dev->dev);
         if (!match)
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index ec794a72975d..61d5f56473e1 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -349,13 +349,8 @@ int add_mtd_device(struct mtd_info *mtd)
         BUG_ON(mtd->writesize == 0);
         mutex_lock(&mtd_table_mutex);
 
-        do {
-                if (!idr_pre_get(&mtd_idr, GFP_KERNEL))
-                        goto fail_locked;
-                error = idr_get_new(&mtd_idr, mtd, &i);
-        } while (error == -EAGAIN);
-
-        if (error)
+        i = idr_alloc(&mtd_idr, mtd, 0, 0, GFP_KERNEL);
+        if (i < 0)
                 goto fail_locked;
 
         mtd->index = i;
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 5819eb575210..81bf5e52601e 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -260,8 +260,7 @@ config MTD_NAND_S3C2410_CLKSTOP
           approximately 5mA of power when there is nothing happening.
 
 config MTD_NAND_DISKONCHIP
-        tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation)"
         depends on HAS_IOMEM
         select REED_SOLOMON
         select REED_SOLOMON_DEC16
@@ -331,8 +330,8 @@ config MTD_NAND_DISKONCHIP_BBTWRITE
           parameter "inftl_bbt_write=1".
 
 config MTD_NAND_DOCG4
-        tristate "Support for DiskOnChip G4 (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && HAS_IOMEM
+        tristate "Support for DiskOnChip G4"
+        depends on HAS_IOMEM
         select BCH
         select BITREVERSE
         help
diff --git a/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c b/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
index 37d5b8956694..b2ab373c9eef 100644
--- a/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
+++ b/drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
@@ -17,8 +17,8 @@
 #include <linux/bcma/bcma.h>
 
 /* Broadcom uses 1'000'000 but it seems to be too many. Tests on WNDR4500 has
- * shown 164 retries as maxiumum. */
-#define NFLASH_READY_RETRIES            1000
+ * shown ~1000 retries as maxiumum. */
+#define NFLASH_READY_RETRIES            10000
 
 #define NFLASH_SECTOR_SIZE              512
 
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 67e62d3d495c..05ba3f0c2d19 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -573,23 +573,22 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
         dma_dev = chan->device;
         dma_addr = dma_map_single(dma_dev->dev, buffer, len, direction);
 
+        flags |= DMA_COMPL_SKIP_SRC_UNMAP | DMA_COMPL_SKIP_DEST_UNMAP;
+
         if (direction == DMA_TO_DEVICE) {
                 dma_src = dma_addr;
                 dma_dst = host->data_pa;
-                flags |= DMA_COMPL_SRC_UNMAP_SINGLE | DMA_COMPL_SKIP_DEST_UNMAP;
         } else {
                 dma_src = host->data_pa;
                 dma_dst = dma_addr;
-                flags |= DMA_COMPL_DEST_UNMAP_SINGLE | DMA_COMPL_SKIP_SRC_UNMAP;
         }
 
         tx = dma_dev->device_prep_dma_memcpy(chan, dma_dst, dma_src,
                         len, flags);
-
         if (!tx) {
                 dev_err(host->dev, "device_prep_dma_memcpy error\n");
-                dma_unmap_single(dma_dev->dev, dma_addr, len, direction);
-                return -EIO;
+                ret = -EIO;
+                goto unmap_dma;
         }
 
         tx->callback = dma_complete;
@@ -599,7 +598,7 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
         ret = dma_submit_error(cookie);
         if (ret) {
                 dev_err(host->dev, "dma_submit_error %d\n", cookie);
-                return ret;
+                goto unmap_dma;
         }
 
         dma_async_issue_pending(chan);
@@ -610,10 +609,17 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len,
         if (ret <= 0) {
                 chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);
                 dev_err(host->dev, "wait_for_completion_timeout\n");
-                return ret ? ret : -ETIMEDOUT;
+                if (!ret)
+                        ret = -ETIMEDOUT;
+                goto unmap_dma;
         }
 
-        return 0;
+        ret = 0;
+
+unmap_dma:
+        dma_unmap_single(dma_dev->dev, dma_addr, len, direction);
+
+        return ret;
 }
 
 /*
@@ -937,42 +943,35 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
         if (!res)
                 return -EINVAL;
 
-        host->data_va = devm_request_and_ioremap(&pdev->dev, res);
-        if (!host->data_va) {
-                dev_err(&pdev->dev, "data ioremap failed\n");
-                return -ENOMEM;
-        }
+        host->data_va = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(host->data_va))
+                return PTR_ERR(host->data_va);
+        
         host->data_pa = (dma_addr_t)res->start;
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_addr");
         if (!res)
                 return -EINVAL;
 
-        host->addr_va = devm_request_and_ioremap(&pdev->dev, res);
-        if (!host->addr_va) {
-                dev_err(&pdev->dev, "ale ioremap failed\n");
-                return -ENOMEM;
-        }
+        host->addr_va = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(host->addr_va))
+                return PTR_ERR(host->addr_va);
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_cmd");
         if (!res)
                 return -EINVAL;
 
-        host->cmd_va = devm_request_and_ioremap(&pdev->dev, res);
-        if (!host->cmd_va) {
-                dev_err(&pdev->dev, "ale ioremap failed\n");
-                return -ENOMEM;
-        }
+        host->cmd_va = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(host->cmd_va))
+                return PTR_ERR(host->cmd_va);
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fsmc_regs");
         if (!res)
                 return -EINVAL;
 
-        host->regs_va = devm_request_and_ioremap(&pdev->dev, res);
-        if (!host->regs_va) {
-                dev_err(&pdev->dev, "regs ioremap failed\n");
-                return -ENOMEM;
-        }
+        host->regs_va = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(host->regs_va))
+                return PTR_ERR(host->regs_va);
 
         host->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(host->clk)) {
@@ -1218,6 +1217,7 @@ static SIMPLE_DEV_PM_OPS(fsmc_nand_pm_ops, fsmc_nand_suspend, fsmc_nand_resume);
 #ifdef CONFIG_OF
 static const struct of_device_id fsmc_nand_id_table[] = {
         { .compatible = "st,spear600-fsmc-nand" },
+        { .compatible = "stericsson,fsmc-nand" },
         {}
 };
 MODULE_DEVICE_TABLE(of, fsmc_nand_id_table);
diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index f182befa7360..0ca22ae9135c 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -677,11 +677,10 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
                 return -ENXIO;
         }
 
-        host->io_base = devm_request_and_ioremap(&pdev->dev, rc);
-        if (host->io_base == NULL) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                return -EIO;
-        }
+        host->io_base = devm_ioremap_resource(&pdev->dev, rc);
+        if (IS_ERR(host->io_base))
+                return PTR_ERR(host->io_base);
+        
         host->io_base_phy = rc->start;
 
         mtd = &host->mtd;
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
index 030b78c62895..be94ed5abefb 100644
--- a/drivers/mtd/nand/lpc32xx_slc.c
+++ b/drivers/mtd/nand/lpc32xx_slc.c
@@ -778,11 +778,9 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
         }
         host->io_base_dma = rc->start;
 
-        host->io_base = devm_request_and_ioremap(&pdev->dev, rc);
-        if (host->io_base == NULL) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                return -ENOMEM;
-        }
+        host->io_base = devm_ioremap_resource(&pdev->dev, rc);
+        if (IS_ERR(host->io_base))
+                return PTR_ERR(host->io_base);
 
         if (pdev->dev.of_node)
                 host->ncfg = lpc32xx_parse_dt(&pdev->dev);
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 20e1241bd099..07e5784e5cd3 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1448,9 +1448,9 @@ static int mxcnd_probe(struct platform_device *pdev)
                 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
                 if (!res)
                         return -ENODEV;
-                host->regs_ip = devm_request_and_ioremap(&pdev->dev, res);
-                if (!host->regs_ip)
-                        return -ENOMEM;
+                host->regs_ip = devm_ioremap_resource(&pdev->dev, res);
+                if (IS_ERR(host->regs_ip))
+                        return PTR_ERR(host->regs_ip);
 
                 res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
         } else {
@@ -1460,9 +1460,9 @@ static int mxcnd_probe(struct platform_device *pdev)
         if (!res)
                 return -ENODEV;
 
-        host->base = devm_request_and_ioremap(&pdev->dev, res);
-        if (!host->base)
-                return -ENOMEM;
+        host->base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(host->base))
+                return PTR_ERR(host->base);
 
         host->main_area0 = host->base;
 
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index a8c1fb475fa6..43214151b882 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2853,8 +2853,11 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
         int i;
         int val;
 
-        /* ONFI need to be probed in 8 bits mode */
-        WARN_ON(chip->options & NAND_BUSWIDTH_16);
+        /* ONFI need to be probed in 8 bits mode, and 16 bits should be selected with NAND_BUSWIDTH_AUTO */
+        if (chip->options & NAND_BUSWIDTH_16) {
+                pr_err("Trying ONFI probe in 16 bits mode, aborting !\n");
+                return 0;
+        }
         /* Try ONFI for unknown chip or LP */
         chip->cmdfunc(mtd, NAND_CMD_READID, 0x20, -1);
         if (chip->read_byte(mtd) != 'O' || chip->read_byte(mtd) != 'N' ||
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 4c317982fce5..891c52a30e6a 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -1408,40 +1408,32 @@ static void clear_memalloc(int memalloc)
                 current->flags &= ~PF_MEMALLOC;
 }
 
-static ssize_t read_file(struct nandsim *ns, struct file *file, void *buf, size_t count, loff_t *pos)
+static ssize_t read_file(struct nandsim *ns, struct file *file, void *buf, size_t count, loff_t pos)
 {
-        mm_segment_t old_fs;
         ssize_t tx;
         int err, memalloc;
 
-        err = get_pages(ns, file, count, *pos);
+        err = get_pages(ns, file, count, pos);
         if (err)
                 return err;
-        old_fs = get_fs();
-        set_fs(get_ds());
         memalloc = set_memalloc();
-        tx = vfs_read(file, (char __user *)buf, count, pos);
+        tx = kernel_read(file, pos, buf, count);
         clear_memalloc(memalloc);
-        set_fs(old_fs);
         put_pages(ns);
         return tx;
 }
 
-static ssize_t write_file(struct nandsim *ns, struct file *file, void *buf, size_t count, loff_t *pos)
+static ssize_t write_file(struct nandsim *ns, struct file *file, void *buf, size_t count, loff_t pos)
 {
-        mm_segment_t old_fs;
         ssize_t tx;
         int err, memalloc;
 
-        err = get_pages(ns, file, count, *pos);
+        err = get_pages(ns, file, count, pos);
         if (err)
                 return err;
-        old_fs = get_fs();
-        set_fs(get_ds());
         memalloc = set_memalloc();
-        tx = vfs_write(file, (char __user *)buf, count, pos);
+        tx = kernel_write(file, buf, count, pos);
         clear_memalloc(memalloc);
-        set_fs(old_fs);
         put_pages(ns);
         return tx;
 }
@@ -1511,7 +1503,7 @@ static void read_page(struct nandsim *ns, int num)
                         if (do_read_error(ns, num))
                                 return;
                         pos = (loff_t)ns->regs.row * ns->geom.pgszoob + ns->regs.column + ns->regs.off;
-                        tx = read_file(ns, ns->cfile, ns->buf.byte, num, &pos);
+                        tx = read_file(ns, ns->cfile, ns->buf.byte, num, pos);
                         if (tx != num) {
                                 NS_ERR("read_page: read error for page %d ret %ld\n", ns->regs.row, (long)tx);
                                 return;
@@ -1573,7 +1565,7 @@ static int prog_page(struct nandsim *ns, int num)
         u_char *pg_off;
 
         if (ns->cfile) {
-                loff_t off, pos;
+                loff_t off;
                 ssize_t tx;
                 int all;
 
@@ -1585,8 +1577,7 @@ static int prog_page(struct nandsim *ns, int num)
                         memset(ns->file_buf, 0xff, ns->geom.pgszoob);
                 } else {
                         all = 0;
-                        pos = off;
-                        tx = read_file(ns, ns->cfile, pg_off, num, &pos);
+                        tx = read_file(ns, ns->cfile, pg_off, num, off);
                         if (tx != num) {
                                 NS_ERR("prog_page: read error for page %d ret %ld\n", ns->regs.row, (long)tx);
                                 return -1;
@@ -1595,16 +1586,15 @@ static int prog_page(struct nandsim *ns, int num)
                 for (i = 0; i < num; i++)
                         pg_off[i] &= ns->buf.byte[i];
                 if (all) {
-                        pos = (loff_t)ns->regs.row * ns->geom.pgszoob;
-                        tx = write_file(ns, ns->cfile, ns->file_buf, ns->geom.pgszoob, &pos);
+                        loff_t pos = (loff_t)ns->regs.row * ns->geom.pgszoob;
+                        tx = write_file(ns, ns->cfile, ns->file_buf, ns->geom.pgszoob, pos);
                         if (tx != ns->geom.pgszoob) {
                                 NS_ERR("prog_page: write error for page %d ret %ld\n", ns->regs.row, (long)tx);
                                 return -1;
                         }
                         ns->pages_written[ns->regs.row] = 1;
                 } else {
-                        pos = off;
-                        tx = write_file(ns, ns->cfile, pg_off, num, &pos);
+                        tx = write_file(ns, ns->cfile, pg_off, num, off);
                         if (tx != num) {
                                 NS_ERR("prog_page: write error for page %d ret %ld\n", ns->regs.row, (long)tx);
                                 return -1;
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 1a88bd062ac1..8e820ddf4e08 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1828,6 +1828,7 @@ static int omap_nand_probe(struct platform_device *pdev)
         dma_cap_mask_t mask;
         unsigned sig;
         struct resource                 *res;
+        struct mtd_part_parser_data     ppdata = {};
 
         pdata = pdev->dev.platform_data;
         if (pdata == NULL) {
@@ -2056,7 +2057,8 @@ static int omap_nand_probe(struct platform_device *pdev)
                 goto out_release_mem_region;
         }
 
-        mtd_device_parse_register(&info->mtd, NULL, NULL, pdata->parts,
+        ppdata.of_node = pdata->of_node;
+        mtd_device_parse_register(&info->mtd, NULL, &ppdata, pdata->parts,
                                   pdata->nr_parts);
 
         platform_set_drvdata(pdev, &info->mtd);
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index df954b4dcba2..d65afd23e171 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -952,10 +952,9 @@ static int s3c24xx_nand_probe(struct platform_device *pdev)
         info->platform  = plat;
         info->cpu_type  = cpu_type;
 
-        info->regs      = devm_request_and_ioremap(&pdev->dev, res);
-        if (info->regs == NULL) {
-                dev_err(&pdev->dev, "cannot reserve register region\n");
-                err = -EIO;
+        info->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(info->regs)) {
+                err = PTR_ERR(info->regs);
                 goto exit_error;
         }
 
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index e3d7266e256f..e1e8748aa47b 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -9,6 +9,7 @@
  * (C) Copyright TOSHIBA CORPORATION 2004-2007
  * All Rights Reserved.
  */
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
@@ -286,9 +287,9 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
         drvdata = devm_kzalloc(&dev->dev, sizeof(*drvdata), GFP_KERNEL);
         if (!drvdata)
                 return -ENOMEM;
-        drvdata->base = devm_request_and_ioremap(&dev->dev, res);
-        if (!drvdata->base)
-                return -EBUSY;
+        drvdata->base = devm_ioremap_resource(&dev->dev, res);
+        if (IS_ERR(drvdata->base))
+                return PTR_ERR(drvdata->base);
 
         hold = plat->hold ?: 20; /* tDH */
         spw = plat->spw ?: 90; /* max(tREADID, tWP, tRP) */
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 065f3fe02a2f..eec2aedb4ab8 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -637,6 +637,7 @@ static int omap2_onenand_probe(struct platform_device *pdev)
         struct onenand_chip *this;
         int r;
         struct resource *res;
+        struct mtd_part_parser_data ppdata = {};
 
         pdata = pdev->dev.platform_data;
         if (pdata == NULL) {
@@ -767,7 +768,8 @@ static int omap2_onenand_probe(struct platform_device *pdev)
         if ((r = onenand_scan(&c->mtd, 1)) < 0)
                 goto err_release_regulator;
 
-        r = mtd_device_parse_register(&c->mtd, NULL, NULL,
+        ppdata.of_node = pdata->of_node;
+        r = mtd_device_parse_register(&c->mtd, NULL, &ppdata,
                                       pdata ? pdata->parts : NULL,
                                       pdata ? pdata->nr_parts : 0);
         if (r)
diff --git a/drivers/mtd/tests/mtd_nandecctest.c b/drivers/mtd/tests/mtd_nandecctest.c
index 5015d10591d9..70106607c247 100644
--- a/drivers/mtd/tests/mtd_nandecctest.c
+++ b/drivers/mtd/tests/mtd_nandecctest.c
@@ -256,7 +256,7 @@ static int nand_ecc_test_run(const size_t size)
                 goto error;
         }
 
-        get_random_bytes(correct_data, size);
+        prandom_bytes(correct_data, size);
         __nand_calculate_ecc(correct_data, size, correct_ecc);
 
         for (i = 0; i < ARRAY_SIZE(nand_ecc_test); i++) {
diff --git a/drivers/mtd/tests/mtd_oobtest.c b/drivers/mtd/tests/mtd_oobtest.c
index e827fa8cd844..3e24b379ffa4 100644
--- a/drivers/mtd/tests/mtd_oobtest.c
+++ b/drivers/mtd/tests/mtd_oobtest.c
@@ -29,6 +29,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
+#include <linux/random.h>
 
 static int dev = -EINVAL;
 module_param(dev, int, S_IRUGO);
@@ -46,26 +47,7 @@ static int use_offset;
 static int use_len;
 static int use_len_max;
 static int vary_offset;
-static unsigned long next = 1;
-
-static inline unsigned int simple_rand(void)
-{
-        next = next * 1103515245 + 12345;
-        return (unsigned int)((next / 65536) % 32768);
-}
-
-static inline void simple_srand(unsigned long seed)
-{
-        next = seed;
-}
-
-static void set_random_data(unsigned char *buf, size_t len)
-{
-        size_t i;
-
-        for (i = 0; i < len; ++i)
-                buf[i] = simple_rand();
-}
+static struct rnd_state rnd_state;
 
 static int erase_eraseblock(int ebnum)
 {
@@ -129,7 +111,7 @@ static int write_eraseblock(int ebnum)
         loff_t addr = ebnum * mtd->erasesize;
 
         for (i = 0; i < pgcnt; ++i, addr += mtd->writesize) {
-                set_random_data(writebuf, use_len);
+                prandom_bytes_state(&rnd_state, writebuf, use_len);
                 ops.mode      = MTD_OPS_AUTO_OOB;
                 ops.len       = 0;
                 ops.retlen    = 0;
@@ -182,7 +164,7 @@ static int verify_eraseblock(int ebnum)
         loff_t addr = ebnum * mtd->erasesize;
 
         for (i = 0; i < pgcnt; ++i, addr += mtd->writesize) {
-                set_random_data(writebuf, use_len);
+                prandom_bytes_state(&rnd_state, writebuf, use_len);
                 ops.mode      = MTD_OPS_AUTO_OOB;
                 ops.len       = 0;
                 ops.retlen    = 0;
@@ -273,7 +255,7 @@ static int verify_eraseblock_in_one_go(int ebnum)
         loff_t addr = ebnum * mtd->erasesize;
         size_t len = mtd->ecclayout->oobavail * pgcnt;
 
-        set_random_data(writebuf, len);
+        prandom_bytes_state(&rnd_state, writebuf, len);
         ops.mode      = MTD_OPS_AUTO_OOB;
         ops.len       = 0;
         ops.retlen    = 0;
@@ -424,12 +406,12 @@ static int __init mtd_oobtest_init(void)
         if (err)
                 goto out;
 
-        simple_srand(1);
+        prandom_seed_state(&rnd_state, 1);
         err = write_whole_device();
         if (err)
                 goto out;
 
-        simple_srand(1);
+        prandom_seed_state(&rnd_state, 1);
         err = verify_all_eraseblocks();
         if (err)
                 goto out;
@@ -444,13 +426,13 @@ static int __init mtd_oobtest_init(void)
         if (err)
                 goto out;
 
-        simple_srand(3);
+        prandom_seed_state(&rnd_state, 3);
         err = write_whole_device();
         if (err)
                 goto out;
 
         /* Check all eraseblocks */
-        simple_srand(3);
+        prandom_seed_state(&rnd_state, 3);
         pr_info("verifying all eraseblocks\n");
         for (i = 0; i < ebcnt; ++i) {
                 if (bbt[i])
@@ -479,7 +461,7 @@ static int __init mtd_oobtest_init(void)
         use_len = mtd->ecclayout->oobavail;
         use_len_max = mtd->ecclayout->oobavail;
         vary_offset = 1;
-        simple_srand(5);
+        prandom_seed_state(&rnd_state, 5);
 
         err = write_whole_device();
         if (err)
@@ -490,7 +472,7 @@ static int __init mtd_oobtest_init(void)
         use_len = mtd->ecclayout->oobavail;
         use_len_max = mtd->ecclayout->oobavail;
         vary_offset = 1;
-        simple_srand(5);
+        prandom_seed_state(&rnd_state, 5);
         err = verify_all_eraseblocks();
         if (err)
                 goto out;
@@ -649,7 +631,7 @@ static int __init mtd_oobtest_init(void)
                 goto out;
 
         /* Write all eraseblocks */
-        simple_srand(11);
+        prandom_seed_state(&rnd_state, 11);
         pr_info("writing OOBs of whole device\n");
         for (i = 0; i < ebcnt - 1; ++i) {
                 int cnt = 2;
@@ -659,7 +641,7 @@ static int __init mtd_oobtest_init(void)
                         continue;
                 addr = (i + 1) * mtd->erasesize - mtd->writesize;
                 for (pg = 0; pg < cnt; ++pg) {
-                        set_random_data(writebuf, sz);
+                        prandom_bytes_state(&rnd_state, writebuf, sz);
                         ops.mode      = MTD_OPS_AUTO_OOB;
                         ops.len       = 0;
                         ops.retlen    = 0;
@@ -680,12 +662,13 @@ static int __init mtd_oobtest_init(void)
         pr_info("written %u eraseblocks\n", i);
 
         /* Check all eraseblocks */
-        simple_srand(11);
+        prandom_seed_state(&rnd_state, 11);
         pr_info("verifying all eraseblocks\n");
         for (i = 0; i < ebcnt - 1; ++i) {
                 if (bbt[i] || bbt[i + 1])
                         continue;
-                set_random_data(writebuf, mtd->ecclayout->oobavail * 2);
+                prandom_bytes_state(&rnd_state, writebuf,
+                                        mtd->ecclayout->oobavail * 2);
                 addr = (i + 1) * mtd->erasesize - mtd->writesize;
                 ops.mode      = MTD_OPS_AUTO_OOB;
                 ops.len       = 0;
diff --git a/drivers/mtd/tests/mtd_pagetest.c b/drivers/mtd/tests/mtd_pagetest.c
index f93a76f88113..0c1140b6c286 100644
--- a/drivers/mtd/tests/mtd_pagetest.c
+++ b/drivers/mtd/tests/mtd_pagetest.c
@@ -29,6 +29,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
+#include <linux/random.h>
 
 static int dev = -EINVAL;
 module_param(dev, int, S_IRUGO);
@@ -45,26 +46,7 @@ static int bufsize;
 static int ebcnt;
 static int pgcnt;
 static int errcnt;
-static unsigned long next = 1;
-
-static inline unsigned int simple_rand(void)
-{
-        next = next * 1103515245 + 12345;
-        return (unsigned int)((next / 65536) % 32768);
-}
-
-static inline void simple_srand(unsigned long seed)
-{
-        next = seed;
-}
-
-static void set_random_data(unsigned char *buf, size_t len)
-{
-        size_t i;
-
-        for (i = 0; i < len; ++i)
-                buf[i] = simple_rand();
-}
+static struct rnd_state rnd_state;
 
 static int erase_eraseblock(int ebnum)
 {
@@ -98,7 +80,7 @@ static int write_eraseblock(int ebnum)
         size_t written;
         loff_t addr = ebnum * mtd->erasesize;
 
-        set_random_data(writebuf, mtd->erasesize);
+        prandom_bytes_state(&rnd_state, writebuf, mtd->erasesize);
         cond_resched();
         err = mtd_write(mtd, addr, mtd->erasesize, &written, writebuf);
         if (err || written != mtd->erasesize)
@@ -124,7 +106,7 @@ static int verify_eraseblock(int ebnum)
         for (i = 0; i < ebcnt && bbt[ebcnt - i - 1]; ++i)
                 addrn -= mtd->erasesize;
 
-        set_random_data(writebuf, mtd->erasesize);
+        prandom_bytes_state(&rnd_state, writebuf, mtd->erasesize);
         for (j = 0; j < pgcnt - 1; ++j, addr += pgsize) {
                 /* Do a read to set the internal dataRAMs to different data */
                 err = mtd_read(mtd, addr0, bufsize, &read, twopages);
@@ -160,7 +142,8 @@ static int verify_eraseblock(int ebnum)
         }
         /* Check boundary between eraseblocks */
         if (addr <= addrn - pgsize - pgsize && !bbt[ebnum + 1]) {
-                unsigned long oldnext = next;
+                struct rnd_state old_state = rnd_state;
+
                 /* Do a read to set the internal dataRAMs to different data */
                 err = mtd_read(mtd, addr0, bufsize, &read, twopages);
                 if (mtd_is_bitflip(err))
@@ -188,13 +171,13 @@ static int verify_eraseblock(int ebnum)
                         return err;
                 }
                 memcpy(boundary, writebuf + mtd->erasesize - pgsize, pgsize);
-                set_random_data(boundary + pgsize, pgsize);
+                prandom_bytes_state(&rnd_state, boundary + pgsize, pgsize);
                 if (memcmp(twopages, boundary, bufsize)) {
                         pr_err("error: verify failed at %#llx\n",
                                (long long)addr);
                         errcnt += 1;
                 }
-                next = oldnext;
+                rnd_state = old_state;
         }
         return err;
 }
@@ -326,7 +309,7 @@ static int erasecrosstest(void)
                 return err;
 
         pr_info("writing 1st page of block %d\n", ebnum);
-        set_random_data(writebuf, pgsize);
+        prandom_bytes_state(&rnd_state, writebuf, pgsize);
         strcpy(writebuf, "There is no data like this!");
         err = mtd_write(mtd, addr0, pgsize, &written, writebuf);
         if (err || written != pgsize) {
@@ -359,7 +342,7 @@ static int erasecrosstest(void)
                 return err;
 
         pr_info("writing 1st page of block %d\n", ebnum);
-        set_random_data(writebuf, pgsize);
+        prandom_bytes_state(&rnd_state, writebuf, pgsize);
         strcpy(writebuf, "There is no data like this!");
         err = mtd_write(mtd, addr0, pgsize, &written, writebuf);
         if (err || written != pgsize) {
@@ -417,7 +400,7 @@ static int erasetest(void)
                 return err;
 
         pr_info("writing 1st page of block %d\n", ebnum);
-        set_random_data(writebuf, pgsize);
+        prandom_bytes_state(&rnd_state, writebuf, pgsize);
         err = mtd_write(mtd, addr0, pgsize, &written, writebuf);
         if (err || written != pgsize) {
                 pr_err("error: write failed at %#llx\n",
@@ -565,7 +548,7 @@ static int __init mtd_pagetest_init(void)
         pr_info("erased %u eraseblocks\n", i);
 
         /* Write all eraseblocks */
-        simple_srand(1);
+        prandom_seed_state(&rnd_state, 1);
         pr_info("writing whole device\n");
         for (i = 0; i < ebcnt; ++i) {
                 if (bbt[i])
@@ -580,7 +563,7 @@ static int __init mtd_pagetest_init(void)
         pr_info("written %u eraseblocks\n", i);
 
         /* Check all eraseblocks */
-        simple_srand(1);
+        prandom_seed_state(&rnd_state, 1);
         pr_info("verifying all eraseblocks\n");
         for (i = 0; i < ebcnt; ++i) {
                 if (bbt[i])
diff --git a/drivers/mtd/tests/mtd_speedtest.c b/drivers/mtd/tests/mtd_speedtest.c
index 596cbea8df4c..a6ce9c1fa6c5 100644
--- a/drivers/mtd/tests/mtd_speedtest.c
+++ b/drivers/mtd/tests/mtd_speedtest.c
@@ -49,13 +49,6 @@ static int pgcnt;
 static int goodebcnt;
 static struct timeval start, finish;
 
-static void set_random_data(unsigned char *buf, size_t len)
-{
-        size_t i;
-
-        for (i = 0; i < len; ++i)
-                buf[i] = random32();
-}
 
 static int erase_eraseblock(int ebnum)
 {
@@ -396,7 +389,7 @@ static int __init mtd_speedtest_init(void)
                 goto out;
         }
 
-        set_random_data(iobuf, mtd->erasesize);
+        prandom_bytes(iobuf, mtd->erasesize);
 
         err = scan_for_bad_eraseblocks();
         if (err)
diff --git a/drivers/mtd/tests/mtd_stresstest.c b/drivers/mtd/tests/mtd_stresstest.c
index 1d29739db916..787f539d16ca 100644
--- a/drivers/mtd/tests/mtd_stresstest.c
+++ b/drivers/mtd/tests/mtd_stresstest.c
@@ -282,8 +282,7 @@ static int __init mtd_stresstest_init(void)
         }
         for (i = 0; i < ebcnt; i++)
                 offsets[i] = mtd->erasesize;
-        for (i = 0; i < bufsize; i++)
-                writebuf[i] = random32();
+        prandom_bytes(writebuf, bufsize);
 
         err = scan_for_bad_eraseblocks();
         if (err)
diff --git a/drivers/mtd/tests/mtd_subpagetest.c b/drivers/mtd/tests/mtd_subpagetest.c
index c880c2229c59..aade56f27945 100644
--- a/drivers/mtd/tests/mtd_subpagetest.c
+++ b/drivers/mtd/tests/mtd_subpagetest.c
@@ -28,6 +28,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
+#include <linux/random.h>
 
 static int dev = -EINVAL;
 module_param(dev, int, S_IRUGO);
@@ -43,26 +44,7 @@ static int bufsize;
 static int ebcnt;
 static int pgcnt;
 static int errcnt;
-static unsigned long next = 1;
-
-static inline unsigned int simple_rand(void)
-{
-        next = next * 1103515245 + 12345;
-        return (unsigned int)((next / 65536) % 32768);
-}
-
-static inline void simple_srand(unsigned long seed)
-{
-        next = seed;
-}
-
-static void set_random_data(unsigned char *buf, size_t len)
-{
-        size_t i;
-
-        for (i = 0; i < len; ++i)
-                buf[i] = simple_rand();
-}
+static struct rnd_state rnd_state;
 
 static inline void clear_data(unsigned char *buf, size_t len)
 {
@@ -119,7 +101,7 @@ static int write_eraseblock(int ebnum)
         int err = 0;
         loff_t addr = ebnum * mtd->erasesize;
 
-        set_random_data(writebuf, subpgsize);
+        prandom_bytes_state(&rnd_state, writebuf, subpgsize);
         err = mtd_write(mtd, addr, subpgsize, &written, writebuf);
         if (unlikely(err || written != subpgsize)) {
                 pr_err("error: write failed at %#llx\n",
@@ -133,7 +115,7 @@ static int write_eraseblock(int ebnum)
 
         addr += subpgsize;
 
-        set_random_data(writebuf, subpgsize);
+        prandom_bytes_state(&rnd_state, writebuf, subpgsize);
         err = mtd_write(mtd, addr, subpgsize, &written, writebuf);
         if (unlikely(err || written != subpgsize)) {
                 pr_err("error: write failed at %#llx\n",
@@ -157,7 +139,7 @@ static int write_eraseblock2(int ebnum)
         for (k = 1; k < 33; ++k) {
                 if (addr + (subpgsize * k) > (ebnum + 1) * mtd->erasesize)
                         break;
-                set_random_data(writebuf, subpgsize * k);
+                prandom_bytes_state(&rnd_state, writebuf, subpgsize * k);
                 err = mtd_write(mtd, addr, subpgsize * k, &written, writebuf);
                 if (unlikely(err || written != subpgsize * k)) {
                         pr_err("error: write failed at %#llx\n",
@@ -193,7 +175,7 @@ static int verify_eraseblock(int ebnum)
         int err = 0;
         loff_t addr = ebnum * mtd->erasesize;
 
-        set_random_data(writebuf, subpgsize);
+        prandom_bytes_state(&rnd_state, writebuf, subpgsize);
         clear_data(readbuf, subpgsize);
         err = mtd_read(mtd, addr, subpgsize, &read, readbuf);
         if (unlikely(err || read != subpgsize)) {
@@ -220,7 +202,7 @@ static int verify_eraseblock(int ebnum)
 
         addr += subpgsize;
 
-        set_random_data(writebuf, subpgsize);
+        prandom_bytes_state(&rnd_state, writebuf, subpgsize);
         clear_data(readbuf, subpgsize);
         err = mtd_read(mtd, addr, subpgsize, &read, readbuf);
         if (unlikely(err || read != subpgsize)) {
@@ -257,7 +239,7 @@ static int verify_eraseblock2(int ebnum)
         for (k = 1; k < 33; ++k) {
                 if (addr + (subpgsize * k) > (ebnum + 1) * mtd->erasesize)
                         break;
-                set_random_data(writebuf, subpgsize * k);
+                prandom_bytes_state(&rnd_state, writebuf, subpgsize * k);
                 clear_data(readbuf, subpgsize * k);
                 err = mtd_read(mtd, addr, subpgsize * k, &read, readbuf);
                 if (unlikely(err || read != subpgsize * k)) {
@@ -430,7 +412,7 @@ static int __init mtd_subpagetest_init(void)
                 goto out;
 
         pr_info("writing whole device\n");
-        simple_srand(1);
+        prandom_seed_state(&rnd_state, 1);
         for (i = 0; i < ebcnt; ++i) {
                 if (bbt[i])
                         continue;
@@ -443,7 +425,7 @@ static int __init mtd_subpagetest_init(void)
         }
         pr_info("written %u eraseblocks\n", i);
 
-        simple_srand(1);
+        prandom_seed_state(&rnd_state, 1);
         pr_info("verifying all eraseblocks\n");
         for (i = 0; i < ebcnt; ++i) {
                 if (bbt[i])
@@ -466,7 +448,7 @@ static int __init mtd_subpagetest_init(void)
                 goto out;
 
         /* Write all eraseblocks */
-        simple_srand(3);
+        prandom_seed_state(&rnd_state, 3);
         pr_info("writing whole device\n");
         for (i = 0; i < ebcnt; ++i) {
                 if (bbt[i])
@@ -481,7 +463,7 @@ static int __init mtd_subpagetest_init(void)
         pr_info("written %u eraseblocks\n", i);
 
         /* Check all eraseblocks */
-        simple_srand(3);
+        prandom_seed_state(&rnd_state, 3);
         pr_info("verifying all eraseblocks\n");
         for (i = 0; i < ebcnt; ++i) {
                 if (bbt[i])
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index dfcc65b33e99..4f02848bb2bc 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -194,7 +194,7 @@ static int vol_cdev_fsync(struct file *file, loff_t start, loff_t end,
 {
         struct ubi_volume_desc *desc = file->private_data;
         struct ubi_device *ubi = desc->vol->ubi;
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         int err;
         mutex_lock(&inode->i_mutex);
         err = ubi_sync(ubi->ubi_num);