Merge tag 'for-linus-20130909' of git://git.infradead.org/linux-mtd

Pull mtd updates from David Woodhouse:
 - factor out common code from MTD tests
 - nand-gpio cleanup and portability to non-ARM
 - m25p80 support for 4-byte addressing chips, other new chips
 - pxa3xx cleanup and support for new platforms
 - remove obsolete alauda, octagon-5066 drivers
 - erase/write support for bcm47xxsflash
 - improve detection of ECC requirements for NAND, controller setup
 - NFC acceleration support for atmel-nand, read/write via SRAM
 - etc

* tag 'for-linus-20130909' of git://git.infradead.org/linux-mtd: (184 commits)
  mtd: chips: Add support for PMC SPI Flash chips in m25p80.c
  mtd: ofpart: use for_each_child_of_node() macro
  mtd: mtdswap: replace strict_strtoul() with kstrtoul()
  mtd cs553x_nand: use kzalloc() instead of memset
  mtd: atmel_nand: fix error return code in atmel_nand_probe()
  mtd: bcm47xxsflash: writing support
  mtd: bcm47xxsflash: implement erasing support
  mtd: bcm47xxsflash: convert to module_platform_driver instead of init/exit
  mtd: bcm47xxsflash: convert kzalloc to avoid invalid access
  mtd: remove alauda driver
  mtd: nand: mxc_nand: mark 'const' properly
  mtd: maps: cfi_flagadm: add missing __iomem annotation
  mtd: spear_smi: add missing __iomem annotation
  mtd: r852: Staticize local symbols
  mtd: nandsim: Staticize local symbols
  mtd: impa7: add missing __iomem annotation
  mtd: sm_ftl: Staticize local symbols
  mtd: m25p80: add support for mr25h10
  mtd: m25p80: make CONFIG_M25PXX_USE_FAST_READ safe to enable
  mtd: m25p80: Pass flags through CAT25_INFO macro
  ...

15 files changed, 26 insertions, 498 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 8b27ca054c59..310dc7c93425 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -157,24 +157,6 @@ config MTD_PXA2XX
         help
           This provides a driver for the NOR flash attached to a PXA2xx chip.
 
-config MTD_OCTAGON
-        tristate "JEDEC Flash device mapped on Octagon 5066 SBC"
-        depends on X86 && MTD_JEDEC && MTD_COMPLEX_MAPPINGS
-        help
-          This provides a 'mapping' driver which supports the way in which
-          the flash chips are connected in the Octagon-5066 Single Board
-          Computer. More information on the board is available at
-          <http://www.octagonsystems.com/products/5066.aspx>.
-
-config MTD_VMAX
-        tristate "JEDEC Flash device mapped on Tempustech VMAX SBC301"
-        depends on X86 && MTD_JEDEC && MTD_COMPLEX_MAPPINGS
-        help
-          This provides a 'mapping' driver which supports the way in which
-          the flash chips are connected in the Tempustech VMAX SBC301 Single
-          Board Computer. More information on the board is available at
-          <http://www.tempustech.com/>.
-
 config MTD_SCx200_DOCFLASH
         tristate "Flash device mapped with DOCCS on NatSemi SCx200"
         depends on SCx200 && MTD_CFI
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 9fdbd4ba6441..141c91a5b24c 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_MTD_ICHXROM)	+= ichxrom.o
 obj-$(CONFIG_MTD_CK804XROM)     += ck804xrom.o
 obj-$(CONFIG_MTD_TSUNAMI)       += tsunami_flash.o
 obj-$(CONFIG_MTD_PXA2XX)        += pxa2xx-flash.o
-obj-$(CONFIG_MTD_OCTAGON)       += octagon-5066.o
 obj-$(CONFIG_MTD_PHYSMAP)       += physmap.o
 obj-$(CONFIG_MTD_PHYSMAP_OF)    += physmap_of.o
 obj-$(CONFIG_MTD_PISMO)         += pismo.o
@@ -28,7 +27,6 @@ obj-$(CONFIG_MTD_SC520CDP)	+= sc520cdp.o
 obj-$(CONFIG_MTD_NETSC520)      += netsc520.o
 obj-$(CONFIG_MTD_TS5500)        += ts5500_flash.o
 obj-$(CONFIG_MTD_SUN_UFLASH)    += sun_uflash.o
-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
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c
index 319b04a6c9d1..5434d8ded015 100644
--- a/drivers/mtd/maps/bfin-async-flash.c
+++ b/drivers/mtd/maps/bfin-async-flash.c
@@ -128,7 +128,7 @@ static const char * const part_probe_types[] = {
 static int bfin_flash_probe(struct platform_device *pdev)
 {
         int ret;
-        struct physmap_flash_data *pdata = pdev->dev.platform_data;
+        struct physmap_flash_data *pdata = dev_get_platdata(&pdev->dev);
         struct resource *memory = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         struct resource *flash_ambctl = platform_get_resource(pdev, IORESOURCE_MEM, 1);
         struct async_state *state;
diff --git a/drivers/mtd/maps/cfi_flagadm.c b/drivers/mtd/maps/cfi_flagadm.c
index d16fc9d3b8cd..d504b3d1791d 100644
--- a/drivers/mtd/maps/cfi_flagadm.c
+++ b/drivers/mtd/maps/cfi_flagadm.c
@@ -55,13 +55,13 @@
 #define FLASH_PARTITION3_SIZE 0x001C0000
 
 
-struct map_info flagadm_map = {
+static struct map_info flagadm_map = {
                 .name =         "FlagaDM flash device",
                 .size =         FLASH_SIZE,
                 .bankwidth =    2,
 };
 
-struct mtd_partition flagadm_parts[] = {
+static struct mtd_partition flagadm_parts[] = {
         {
                 .name =         "Bootloader",
                 .offset =       FLASH_PARTITION0_ADDR,
@@ -112,7 +112,7 @@ static int __init init_flagadm(void)
                 return 0;
         }
 
-        iounmap((void *)flagadm_map.virt);
+        iounmap((void __iomem *)flagadm_map.virt);
         return -ENXIO;
 }
 
@@ -123,8 +123,8 @@ static void __exit cleanup_flagadm(void)
                 map_destroy(mymtd);
         }
         if (flagadm_map.virt) {
-                iounmap((void *)flagadm_map.virt);
-                flagadm_map.virt = 0;
+                iounmap((void __iomem *)flagadm_map.virt);
+                flagadm_map.virt = NULL;
         }
 }
 
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c
index 5ede28294f9e..1adba86474a5 100644
--- a/drivers/mtd/maps/gpio-addr-flash.c
+++ b/drivers/mtd/maps/gpio-addr-flash.c
@@ -196,7 +196,7 @@ static int gpio_flash_probe(struct platform_device *pdev)
         struct resource *gpios;
         struct async_state *state;
 
-        pdata = pdev->dev.platform_data;
+        pdata = dev_get_platdata(&pdev->dev);
         memory = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         gpios = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 
diff --git a/drivers/mtd/maps/impa7.c b/drivers/mtd/maps/impa7.c
index 49686744d93c..15bbda03be65 100644
--- a/drivers/mtd/maps/impa7.c
+++ b/drivers/mtd/maps/impa7.c
@@ -79,7 +79,7 @@ static int __init init_impa7(void)
                 }
                 simple_map_init(&impa7_map[i]);
 
-                impa7_mtd[i] = 0;
+                impa7_mtd[i] = NULL;
                 type = rom_probe_types;
                 for(; !impa7_mtd[i] && *type; type++) {
                         impa7_mtd[i] = do_map_probe(*type, &impa7_map[i]);
@@ -91,9 +91,9 @@ static int __init init_impa7(void)
                         mtd_device_parse_register(impa7_mtd[i], NULL, NULL,
                                                   partitions,
                                                   ARRAY_SIZE(partitions));
+                } else {
+                        iounmap((void __iomem *)impa7_map[i].virt);
                 }
-                else
-                        iounmap((void *)impa7_map[i].virt);
         }
         return devicesfound == 0 ? -ENXIO : 0;
 }
@@ -105,8 +105,8 @@ static void __exit cleanup_impa7(void)
                 if (impa7_mtd[i]) {
                         mtd_device_unregister(impa7_mtd[i]);
                         map_destroy(impa7_mtd[i]);
-                        iounmap((void *)impa7_map[i].virt);
-                        impa7_map[i].virt = 0;
+                        iounmap((void __iomem *)impa7_map[i].virt);
+                        impa7_map[i].virt = NULL;
                 }
         }
 }
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 52b3410a105c..10debfea81e7 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -152,11 +152,9 @@ static const char * const probes[] = { "RedBoot", "cmdlinepart", NULL };
 
 static int ixp4xx_flash_remove(struct platform_device *dev)
 {
-        struct flash_platform_data *plat = dev->dev.platform_data;
+        struct flash_platform_data *plat = dev_get_platdata(&dev->dev);
         struct ixp4xx_flash_info *info = platform_get_drvdata(dev);
 
-        platform_set_drvdata(dev, NULL);
-
         if(!info)
                 return 0;
 
@@ -180,7 +178,7 @@ static int ixp4xx_flash_remove(struct platform_device *dev)
 
 static int ixp4xx_flash_probe(struct platform_device *dev)
 {
-        struct flash_platform_data *plat = dev->dev.platform_data;
+        struct flash_platform_data *plat = dev_get_platdata(&dev->dev);
         struct ixp4xx_flash_info *info;
         struct mtd_part_parser_data ppdata = {
                 .origin = dev->resource->start,
diff --git a/drivers/mtd/maps/latch-addr-flash.c b/drivers/mtd/maps/latch-addr-flash.c
index ab0fead56b83..98bb5d5375d7 100644
--- a/drivers/mtd/maps/latch-addr-flash.c
+++ b/drivers/mtd/maps/latch-addr-flash.c
@@ -102,9 +102,8 @@ static int latch_addr_flash_remove(struct platform_device *dev)
         info = platform_get_drvdata(dev);
         if (info == NULL)
                 return 0;
-        platform_set_drvdata(dev, NULL);
 
-        latch_addr_data = dev->dev.platform_data;
+        latch_addr_data = dev_get_platdata(&dev->dev);
 
         if (info->mtd != NULL) {
                 mtd_device_unregister(info->mtd);
@@ -135,7 +134,7 @@ static int latch_addr_flash_probe(struct platform_device *dev)
         int chipsel;
         int err;
 
-        latch_addr_data = dev->dev.platform_data;
+        latch_addr_data = dev_get_platdata(&dev->dev);
         if (latch_addr_data == NULL)
                 return -ENODEV;
 
diff --git a/drivers/mtd/maps/octagon-5066.c b/drivers/mtd/maps/octagon-5066.c
deleted file mode 100644
index 807ac2a2e686..000000000000
--- a/drivers/mtd/maps/octagon-5066.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/* ######################################################################
-
-   Octagon 5066 MTD Driver.
-
-   The Octagon 5066 is a SBC based on AMD's 586-WB running at 133 MHZ. It
-   comes with a builtin AMD 29F016 flash chip and a socketed EEPROM that
-   is replacable by flash. Both units are mapped through a multiplexer
-   into a 32k memory window at 0xe8000. The control register for the
-   multiplexing unit is located at IO 0x208 with a bit map of
-     0-5 Page Selection in 32k increments
-     6-7 Device selection:
-        00 SSD off
-        01 SSD 0 (Socket)
-        10 SSD 1 (Flash chip)
-        11 undefined
-
-   On each SSD, the first 128k is reserved for use by the bios
-   (actually it IS the bios..) This only matters if you are booting off the
-   flash, you must not put a file system starting there.
-
-   The driver tries to do a detection algorithm to guess what sort of devices
-   are plugged into the sockets.
-
-   ##################################################################### */
-
-#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <asm/io.h>
-
-#include <linux/mtd/map.h>
-#include <linux/mtd/mtd.h>
-
-#define WINDOW_START 0xe8000
-#define WINDOW_LENGTH 0x8000
-#define WINDOW_SHIFT 27
-#define WINDOW_MASK 0x7FFF
-#define PAGE_IO 0x208
-
-static volatile char page_n_dev = 0;
-static unsigned long iomapadr;
-static DEFINE_SPINLOCK(oct5066_spin);
-
-/*
- * We use map_priv_1 to identify which device we are.
- */
-
-static void __oct5066_page(struct map_info *map, __u8 byte)
-{
-        outb(byte,PAGE_IO);
-        page_n_dev = byte;
-}
-
-static inline void oct5066_page(struct map_info *map, unsigned long ofs)
-{
-        __u8 byte = map->map_priv_1 | (ofs >> WINDOW_SHIFT);
-
-        if (page_n_dev != byte)
-                __oct5066_page(map, byte);
-}
-
-
-static map_word oct5066_read8(struct map_info *map, unsigned long ofs)
-{
-        map_word ret;
-        spin_lock(&oct5066_spin);
-        oct5066_page(map, ofs);
-        ret.x[0] = readb(iomapadr + (ofs & WINDOW_MASK));
-        spin_unlock(&oct5066_spin);
-        return ret;
-}
-
-static void oct5066_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
-{
-        while(len) {
-                unsigned long thislen = len;
-                if (len > (WINDOW_LENGTH - (from & WINDOW_MASK)))
-                        thislen = WINDOW_LENGTH-(from & WINDOW_MASK);
-
-                spin_lock(&oct5066_spin);
-                oct5066_page(map, from);
-                memcpy_fromio(to, iomapadr + from, thislen);
-                spin_unlock(&oct5066_spin);
-                to += thislen;
-                from += thislen;
-                len -= thislen;
-        }
-}
-
-static void oct5066_write8(struct map_info *map, map_word d, unsigned long adr)
-{
-        spin_lock(&oct5066_spin);
-        oct5066_page(map, adr);
-        writeb(d.x[0], iomapadr + (adr & WINDOW_MASK));
-        spin_unlock(&oct5066_spin);
-}
-
-static void oct5066_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
-{
-        while(len) {
-                unsigned long thislen = len;
-                if (len > (WINDOW_LENGTH - (to & WINDOW_MASK)))
-                        thislen = WINDOW_LENGTH-(to & WINDOW_MASK);
-
-                spin_lock(&oct5066_spin);
-                oct5066_page(map, to);
-                memcpy_toio(iomapadr + to, from, thislen);
-                spin_unlock(&oct5066_spin);
-                to += thislen;
-                from += thislen;
-                len -= thislen;
-        }
-}
-
-static struct map_info oct5066_map[2] = {
-        {
-                .name = "Octagon 5066 Socket",
-                .phys = NO_XIP,
-                .size = 512 * 1024,
-                .bankwidth = 1,
-                .read = oct5066_read8,
-                .copy_from = oct5066_copy_from,
-                .write = oct5066_write8,
-                .copy_to = oct5066_copy_to,
-                .map_priv_1 = 1<<6
-        },
-        {
-                .name = "Octagon 5066 Internal Flash",
-                .phys = NO_XIP,
-                .size = 2 * 1024 * 1024,
-                .bankwidth = 1,
-                .read = oct5066_read8,
-                .copy_from = oct5066_copy_from,
-                .write = oct5066_write8,
-                .copy_to = oct5066_copy_to,
-                .map_priv_1 = 2<<6
-        }
-};
-
-static struct mtd_info *oct5066_mtd[2] = {NULL, NULL};
-
-// OctProbe - Sense if this is an octagon card
-// ---------------------------------------------------------------------
-/* Perform a simple validity test, we map the window select SSD0 and
-   change pages while monitoring the window. A change in the window,
-   controlled by the PAGE_IO port is a functioning 5066 board. This will
-   fail if the thing in the socket is set to a uniform value. */
-static int __init OctProbe(void)
-{
-   unsigned int Base = (1 << 6);
-   unsigned long I;
-   unsigned long Values[10];
-   for (I = 0; I != 20; I++)
-   {
-      outb(Base + (I%10),PAGE_IO);
-      if (I < 10)
-      {
-         // Record the value and check for uniqueness
-         Values[I%10] = readl(iomapadr);
-         if (I > 0 && Values[I%10] == Values[0])
-            return -EAGAIN;
-      }
-      else
-      {
-         // Make sure we get the same values on the second pass
-         if (Values[I%10] != readl(iomapadr))
-            return -EAGAIN;
-      }
-   }
-   return 0;
-}
-
-void cleanup_oct5066(void)
-{
-        int i;
-        for (i=0; i<2; i++) {
-                if (oct5066_mtd[i]) {
-                        mtd_device_unregister(oct5066_mtd[i]);
-                        map_destroy(oct5066_mtd[i]);
-                }
-        }
-        iounmap((void *)iomapadr);
-        release_region(PAGE_IO, 1);
-}
-
-static int __init init_oct5066(void)
-{
-        int i;
-        int ret = 0;
-
-        // Do an autoprobe sequence
-        if (!request_region(PAGE_IO,1,"Octagon SSD")) {
-                printk(KERN_NOTICE "5066: Page Register in Use\n");
-                return -EAGAIN;
-        }
-        iomapadr = (unsigned long)ioremap(WINDOW_START, WINDOW_LENGTH);
-        if (!iomapadr) {
-                printk(KERN_NOTICE "Failed to ioremap memory region\n");
-                ret = -EIO;
-                goto out_rel;
-        }
-        if (OctProbe() != 0) {
-                printk(KERN_NOTICE "5066: Octagon Probe Failed, is this an Octagon 5066 SBC?\n");
-                iounmap((void *)iomapadr);
-                ret = -EAGAIN;
-                goto out_unmap;
-        }
-
-        // Print out our little header..
-        printk("Octagon 5066 SSD IO:0x%x MEM:0x%x-0x%x\n",PAGE_IO,WINDOW_START,
-               WINDOW_START+WINDOW_LENGTH);
-
-        for (i=0; i<2; i++) {
-                oct5066_mtd[i] = do_map_probe("cfi_probe", &oct5066_map[i]);
-                if (!oct5066_mtd[i])
-                        oct5066_mtd[i] = do_map_probe("jedec", &oct5066_map[i]);
-                if (!oct5066_mtd[i])
-                        oct5066_mtd[i] = do_map_probe("map_ram", &oct5066_map[i]);
-                if (!oct5066_mtd[i])
-                        oct5066_mtd[i] = do_map_probe("map_rom", &oct5066_map[i]);
-                if (oct5066_mtd[i]) {
-                        oct5066_mtd[i]->owner = THIS_MODULE;
-                        mtd_device_register(oct5066_mtd[i], NULL, 0);
-                }
-        }
-
-        if (!oct5066_mtd[0] && !oct5066_mtd[1]) {
-                cleanup_oct5066();
-                return -ENXIO;
-        }
-
-        return 0;
-
- out_unmap:
-        iounmap((void *)iomapadr);
- out_rel:
-        release_region(PAGE_IO, 1);
-        return ret;
-}
-
-module_init(init_oct5066);
-module_exit(cleanup_oct5066);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jason Gunthorpe <jgg@deltatee.com>, David Woodhouse <dwmw2@infradead.org>");
-MODULE_DESCRIPTION("MTD map driver for Octagon 5066 Single Board Computer");
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index e7a592c8c765..f73cd461257c 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -40,9 +40,8 @@ static int physmap_flash_remove(struct platform_device *dev)
         info = platform_get_drvdata(dev);
         if (info == NULL)
                 return 0;
-        platform_set_drvdata(dev, NULL);
 
-        physmap_data = dev->dev.platform_data;
+        physmap_data = dev_get_platdata(&dev->dev);
 
         if (info->cmtd) {
                 mtd_device_unregister(info->cmtd);
@@ -69,7 +68,7 @@ static void physmap_set_vpp(struct map_info *map, int state)
         unsigned long flags;
 
         pdev = (struct platform_device *)map->map_priv_1;
-        physmap_data = pdev->dev.platform_data;
+        physmap_data = dev_get_platdata(&pdev->dev);
 
         if (!physmap_data->set_vpp)
                 return;
@@ -103,7 +102,7 @@ static int physmap_flash_probe(struct platform_device *dev)
         int i;
         int devices_found = 0;
 
-        physmap_data = dev->dev.platform_data;
+        physmap_data = dev_get_platdata(&dev->dev);
         if (physmap_data == NULL)
                 return -ENODEV;
 
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index 71fdda29594b..676271659b37 100644
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -84,8 +84,6 @@ static int platram_remove(struct platform_device *pdev)
 {
         struct platram_info *info = to_platram_info(pdev);
 
-        platform_set_drvdata(pdev, NULL);
-
         dev_dbg(&pdev->dev, "removing device\n");
 
         if (info == NULL)
@@ -130,13 +128,13 @@ static int platram_probe(struct platform_device *pdev)
 
         dev_dbg(&pdev->dev, "probe entered\n");
 
-        if (pdev->dev.platform_data == NULL) {
+        if (dev_get_platdata(&pdev->dev) == NULL) {
                 dev_err(&pdev->dev, "no platform data supplied\n");
                 err = -ENOENT;
                 goto exit_error;
         }
 
-        pdata = pdev->dev.platform_data;
+        pdata = dev_get_platdata(&pdev->dev);
 
         info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (info == NULL) {
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index acb1dbcf7ce5..d210d131fef2 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -49,7 +49,7 @@ static const char * const probes[] = { "RedBoot", "cmdlinepart", NULL };
 
 static int pxa2xx_flash_probe(struct platform_device *pdev)
 {
-        struct flash_platform_data *flash = pdev->dev.platform_data;
+        struct flash_platform_data *flash = dev_get_platdata(&pdev->dev);
         struct pxa2xx_flash_info *info;
         struct resource *res;
 
@@ -107,8 +107,6 @@ static int pxa2xx_flash_remove(struct platform_device *dev)
 {
         struct pxa2xx_flash_info *info = platform_get_drvdata(dev);
 
-        platform_set_drvdata(dev, NULL);
-
         mtd_device_unregister(info->mtd);
 
         map_destroy(info->mtd);
diff --git a/drivers/mtd/maps/rbtx4939-flash.c b/drivers/mtd/maps/rbtx4939-flash.c
index ac02fbffd6df..93525121d69d 100644
--- a/drivers/mtd/maps/rbtx4939-flash.c
+++ b/drivers/mtd/maps/rbtx4939-flash.c
@@ -34,10 +34,9 @@ static int rbtx4939_flash_remove(struct platform_device *dev)
         info = platform_get_drvdata(dev);
         if (!info)
                 return 0;
-        platform_set_drvdata(dev, NULL);
 
         if (info->mtd) {
-                struct rbtx4939_flash_data *pdata = dev->dev.platform_data;
+                struct rbtx4939_flash_data *pdata = dev_get_platdata(&dev->dev);
 
                 mtd_device_unregister(info->mtd);
                 map_destroy(info->mtd);
@@ -57,7 +56,7 @@ static int rbtx4939_flash_probe(struct platform_device *dev)
         int err = 0;
         unsigned long size;
 
-        pdata = dev->dev.platform_data;
+        pdata = dev_get_platdata(&dev->dev);
         if (!pdata)
                 return -ENODEV;
 
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 29e3dcaa1d90..8fc06bf111c4 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -248,7 +248,7 @@ static const char * const part_probes[] = { "cmdlinepart", "RedBoot", NULL };
 
 static int sa1100_mtd_probe(struct platform_device *pdev)
 {
-        struct flash_platform_data *plat = pdev->dev.platform_data;
+        struct flash_platform_data *plat = dev_get_platdata(&pdev->dev);
         struct sa_info *info;
         int err;
 
@@ -277,9 +277,8 @@ static int sa1100_mtd_probe(struct platform_device *pdev)
 static int __exit sa1100_mtd_remove(struct platform_device *pdev)
 {
         struct sa_info *info = platform_get_drvdata(pdev);
-        struct flash_platform_data *plat = pdev->dev.platform_data;
+        struct flash_platform_data *plat = dev_get_platdata(&pdev->dev);
 
-        platform_set_drvdata(pdev, NULL);
         sa1100_destroy(info, plat);
 
         return 0;
diff --git a/drivers/mtd/maps/vmax301.c b/drivers/mtd/maps/vmax301.c
deleted file mode 100644
index 5e68de73eabc..000000000000
--- a/drivers/mtd/maps/vmax301.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* ######################################################################
-
-   Tempustech VMAX SBC301 MTD Driver.
-
-   The VMAx 301 is a SBC based on . It
-   comes with three builtin AMD 29F016B flash chips and a socket for SRAM or
-   more flash. Each unit has it's own 8k mapping into a settable region
-   (0xD8000). There are two 8k mappings for each MTD, the first is always set
-   to the lower 8k of the device the second is paged. Writing a 16 bit page
-   value to anywhere in the first 8k will cause the second 8k to page around.
-
-   To boot the device a bios extension must be installed into the first 8k
-   of flash that is smart enough to copy itself down, page in the rest of
-   itself and begin executing.
-
-   ##################################################################### */
-
-#include <linux/module.h>
-#include <linux/ioport.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-#include <asm/io.h>
-
-#include <linux/mtd/map.h>
-#include <linux/mtd/mtd.h>
-
-
-#define WINDOW_START 0xd8000
-#define WINDOW_LENGTH 0x2000
-#define WINDOW_SHIFT 25
-#define WINDOW_MASK 0x1FFF
-
-/* Actually we could use two spinlocks, but we'd have to have
-   more private space in the struct map_info. We lose a little
-   performance like this, but we'd probably lose more by having
-   the extra indirection from having one of the map->map_priv
-   fields pointing to yet another private struct.
-*/
-static DEFINE_SPINLOCK(vmax301_spin);
-
-static void __vmax301_page(struct map_info *map, unsigned long page)
-{
-        writew(page, map->map_priv_2 - WINDOW_LENGTH);
-        map->map_priv_1 = page;
-}
-
-static inline void vmax301_page(struct map_info *map,
-                                  unsigned long ofs)
-{
-        unsigned long page = (ofs >> WINDOW_SHIFT);
-        if (map->map_priv_1 != page)
-                __vmax301_page(map, page);
-}
-
-static map_word vmax301_read8(struct map_info *map, unsigned long ofs)
-{
-        map_word ret;
-        spin_lock(&vmax301_spin);
-        vmax301_page(map, ofs);
-        ret.x[0] = readb(map->map_priv_2 + (ofs & WINDOW_MASK));
-        spin_unlock(&vmax301_spin);
-        return ret;
-}
-
-static void vmax301_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
-{
-        while(len) {
-                unsigned long thislen = len;
-                if (len > (WINDOW_LENGTH - (from & WINDOW_MASK)))
-                        thislen = WINDOW_LENGTH-(from & WINDOW_MASK);
-                spin_lock(&vmax301_spin);
-                vmax301_page(map, from);
-                memcpy_fromio(to, map->map_priv_2 + from, thislen);
-                spin_unlock(&vmax301_spin);
-                to += thislen;
-                from += thislen;
-                len -= thislen;
-        }
-}
-
-static void vmax301_write8(struct map_info *map, map_word d, unsigned long adr)
-{
-        spin_lock(&vmax301_spin);
-        vmax301_page(map, adr);
-        writeb(d.x[0], map->map_priv_2 + (adr & WINDOW_MASK));
-        spin_unlock(&vmax301_spin);
-}
-
-static void vmax301_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
-{
-        while(len) {
-                unsigned long thislen = len;
-                if (len > (WINDOW_LENGTH - (to & WINDOW_MASK)))
-                        thislen = WINDOW_LENGTH-(to & WINDOW_MASK);
-
-                spin_lock(&vmax301_spin);
-                vmax301_page(map, to);
-                memcpy_toio(map->map_priv_2 + to, from, thislen);
-                spin_unlock(&vmax301_spin);
-                to += thislen;
-                from += thislen;
-                len -= thislen;
-        }
-}
-
-static struct map_info vmax_map[2] = {
-        {
-                .name = "VMAX301 Internal Flash",
-                .phys = NO_XIP,
-                .size = 3*2*1024*1024,
-                .bankwidth = 1,
-                .read = vmax301_read8,
-                .copy_from = vmax301_copy_from,
-                .write = vmax301_write8,
-                .copy_to = vmax301_copy_to,
-                .map_priv_1 = WINDOW_START + WINDOW_LENGTH,
-                .map_priv_2 = 0xFFFFFFFF
-        },
-        {
-                .name = "VMAX301 Socket",
-                .phys = NO_XIP,
-                .size = 0,
-                .bankwidth = 1,
-                .read = vmax301_read8,
-                .copy_from = vmax301_copy_from,
-                .write = vmax301_write8,
-                .copy_to = vmax301_copy_to,
-                .map_priv_1 = WINDOW_START + (3*WINDOW_LENGTH),
-                .map_priv_2 = 0xFFFFFFFF
-        }
-};
-
-static struct mtd_info *vmax_mtd[2] = {NULL, NULL};
-
-static void __exit cleanup_vmax301(void)
-{
-        int i;
-
-        for (i=0; i<2; i++) {
-                if (vmax_mtd[i]) {
-                        mtd_device_unregister(vmax_mtd[i]);
-                        map_destroy(vmax_mtd[i]);
-                }
-        }
-        iounmap((void *)vmax_map[0].map_priv_1 - WINDOW_START);
-}
-
-static int __init init_vmax301(void)
-{
-        int i;
-        unsigned long iomapadr;
-        // Print out our little header..
-        printk("Tempustech VMAX 301 MEM:0x%x-0x%x\n",WINDOW_START,
-               WINDOW_START+4*WINDOW_LENGTH);
-
-        iomapadr = (unsigned long)ioremap(WINDOW_START, WINDOW_LENGTH*4);
-        if (!iomapadr) {
-                printk("Failed to ioremap memory region\n");
-                return -EIO;
-        }
-        /* Put the address in the map's private data area.
-           We store the actual MTD IO address rather than the
-           address of the first half, because it's used more
-           often.
-        */
-        vmax_map[0].map_priv_2 = iomapadr + WINDOW_START;
-        vmax_map[1].map_priv_2 = iomapadr + (3*WINDOW_START);
-
-        for (i=0; i<2; i++) {
-                vmax_mtd[i] = do_map_probe("cfi_probe", &vmax_map[i]);
-                if (!vmax_mtd[i])
-                        vmax_mtd[i] = do_map_probe("jedec", &vmax_map[i]);
-                if (!vmax_mtd[i])
-                        vmax_mtd[i] = do_map_probe("map_ram", &vmax_map[i]);
-                if (!vmax_mtd[i])
-                        vmax_mtd[i] = do_map_probe("map_rom", &vmax_map[i]);
-                if (vmax_mtd[i]) {
-                        vmax_mtd[i]->owner = THIS_MODULE;
-                        mtd_device_register(vmax_mtd[i], NULL, 0);
-                }
-        }
-
-        if (!vmax_mtd[0] && !vmax_mtd[1]) {
-                iounmap((void *)iomapadr);
-                return -ENXIO;
-        }
-
-        return 0;
-}
-
-module_init(init_vmax301);
-module_exit(cleanup_vmax301);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
-MODULE_DESCRIPTION("MTD map driver for Tempustech VMAX SBC301 board");