ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info

The set_vpp() method provided by physmap passes a map_info back to
the platform code, which has little relevance as far as the platform
is concerned (this parameter is completely unused).

Instead, pass the platform_device, which can be used in the pismo
driver to retrieve some important information in a nicer way, instead
of the hack that was in place.

The empty set_vpp function in board-at572d940hf_ek.c is left untouched,
as the board/SoC is scheduled for removal.

Cc: Andrew Victor <linux@maxim.org.za>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Acked-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Acked-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 15 insertions, 5 deletions

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 49676b7a53a4..1a9b94f0ee54 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -74,6 +74,18 @@ static int physmap_flash_remove(struct platform_device *dev)
         return 0;
 }
 
+static void physmap_set_vpp(struct map_info *map, int state)
+{
+        struct platform_device *pdev;
+        struct physmap_flash_data *physmap_data;
+
+        pdev = (struct platform_device *)map->map_priv_1;
+        physmap_data = pdev->dev.platform_data;
+
+        if (physmap_data->set_vpp)
+                physmap_data->set_vpp(pdev, state);
+}
+
 static const char *rom_probe_types[] = {
                                         "cfi_probe",
                                         "jedec_probe",
@@ -81,10 +93,7 @@ static const char *rom_probe_types[] = {
                                         "map_rom",
                                         NULL };
 #ifdef CONFIG_MTD_PARTITIONS
-static const char *part_probe_types[] = { "cmdlinepart", "RedBoot",
-#ifdef CONFIG_MTD_AFS_PARTS
-                                          "afs",
-#endif
+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "afs",
                                           NULL };
 #endif
 
@@ -134,8 +143,9 @@ static int physmap_flash_probe(struct platform_device *dev)
                 info->map[i].phys = dev->resource[i].start;
                 info->map[i].size = resource_size(&dev->resource[i]);
                 info->map[i].bankwidth = physmap_data->width;
-                info->map[i].set_vpp = physmap_data->set_vpp;
+                info->map[i].set_vpp = physmap_set_vpp;
                 info->map[i].pfow_base = physmap_data->pfow_base;
+                info->map[i].map_priv_1 = (unsigned long)dev;
 
                 info->map[i].virt = devm_ioremap(&dev->dev, info->map[i].phys,
                                                  info->map[i].size);