mtd: Use platform_data to retrieve tmio_nand platform bits

With the addition of the platform device mfd_cell pointer, we can now
cleanly pass the sub device drivers platform data pointers through the
regular device platform_data one, and get rid of mfd_get_data().

Cc: Ian Molton <spyro@f2s.com>
Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

3 files changed, 6 insertions, 3 deletions

diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
index 5ef0b8fba10..91ad21ef772 100644
--- a/drivers/mfd/t7l66xb.c
+++ b/drivers/mfd/t7l66xb.c
@@ -383,7 +383,8 @@ static int t7l66xb_probe(struct platform_device *dev)
 
         t7l66xb_attach_irq(dev);
 
-        t7l66xb_cells[T7L66XB_CELL_NAND].mfd_data = pdata->nand_data;
+        t7l66xb_cells[T7L66XB_CELL_NAND].platform_data = pdata->nand_data;
+        t7l66xb_cells[T7L66XB_CELL_NAND].pdata_size = sizeof(*pdata->nand_data);
 
         ret = mfd_add_devices(&dev->dev, dev->id,
                               t7l66xb_cells, ARRAY_SIZE(t7l66xb_cells),
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index b3d5852b069..9612264f0e6 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -693,7 +693,9 @@ static int __devinit tc6393xb_probe(struct platform_device *dev)
                         goto err_setup;
         }
 
-        tc6393xb_cells[TC6393XB_CELL_NAND].mfd_data = tcpd->nand_data;
+        tc6393xb_cells[TC6393XB_CELL_NAND].platform_data = tcpd->nand_data;
+        tc6393xb_cells[TC6393XB_CELL_NAND].pdata_size =
+                                                sizeof(*tcpd->nand_data);
         tc6393xb_cells[TC6393XB_CELL_FB].platform_data = tcpd->fb_data;
         tc6393xb_cells[TC6393XB_CELL_FB].pdata_size = sizeof(*tcpd->fb_data);
 
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
index 14c57870782..c004e474631 100644
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/tmio_nand.c
@@ -372,7 +372,7 @@ static void tmio_hw_stop(struct platform_device *dev, struct tmio_nand *tmio)
 
 static int tmio_probe(struct platform_device *dev)
 {
-        struct tmio_nand_data *data = mfd_get_data(dev);
+        struct tmio_nand_data *data = dev->dev.platform_data;
         struct resource *fcr = platform_get_resource(dev,
                         IORESOURCE_MEM, 0);
         struct resource *ccr = platform_get_resource(dev,