2 files changed, 18 insertions, 42 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);
diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c
index f4ce273e93fd..65bd1cd4d627 100644
--- a/drivers/mtd/maps/pismo.c
+++ b/drivers/mtd/maps/pismo.c
@@ -50,39 +50,13 @@ struct pismo_data {
         struct platform_device  *dev[PISMO_NUM_CS];
 };
 
-/* FIXME: set_vpp could do with a better calling convention */
-static struct pismo_data *vpp_pismo;
-static DEFINE_MUTEX(pismo_mutex);
-
-static int pismo_setvpp_probe_fix(struct pismo_data *pismo)
+static void pismo_set_vpp(struct platform_device *pdev, int on)
 {
-        mutex_lock(&pismo_mutex);
-        if (vpp_pismo) {
-                mutex_unlock(&pismo_mutex);
-                kfree(pismo);
-                return -EBUSY;
-        }
-        vpp_pismo = pismo;
-        mutex_unlock(&pismo_mutex);
-        return 0;
-}
-
-static void pismo_setvpp_remove_fix(struct pismo_data *pismo)
-{
-        mutex_lock(&pismo_mutex);
-        if (vpp_pismo == pismo)
-                vpp_pismo = NULL;
-        mutex_unlock(&pismo_mutex);
-}
-
-static void pismo_set_vpp(struct map_info *map, int on)
-{
-        struct pismo_data *pismo = vpp_pismo;
+        struct i2c_client *client = to_i2c_client(pdev->dev.parent);
+        struct pismo_data *pismo = i2c_get_clientdata(client);
 
         pismo->vpp(pismo->vpp_data, on);
 }
-/* end of hack */
-
 
 static unsigned int __devinit pismo_width_to_bytes(unsigned int width)
 {
@@ -231,9 +205,6 @@ static int __devexit pismo_remove(struct i2c_client *client)
         for (i = 0; i < ARRAY_SIZE(pismo->dev); i++)
                 platform_device_unregister(pismo->dev[i]);
 
-        /* FIXME: set_vpp needs saner arguments */
-        pismo_setvpp_remove_fix(pismo);
-
         kfree(pismo);
 
         return 0;
@@ -257,11 +228,6 @@ static int __devinit pismo_probe(struct i2c_client *client,
         if (!pismo)
                 return -ENOMEM;
 
-        /* FIXME: set_vpp needs saner arguments */
-        ret = pismo_setvpp_probe_fix(pismo);
-        if (ret)
-                return ret;
-
         pismo->client = client;
         if (pdata) {
                 pismo->vpp = pdata->set_vpp;