mfd: mfd_cell is now implicitly available to ab3100 drivers

The cell's platform_data is now accessed with a helper function;
change clients to use that, and remove the now-unused data_size.

Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

2 files changed, 3 insertions, 4 deletions

diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 1707d224232d..2dcab8643e71 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -949,10 +949,8 @@ static int __devinit ab3100_probe(struct i2c_client *client,
                 goto exit_no_ops;
 
         /* Set up and register the platform devices. */
-        for (i = 0; i < ARRAY_SIZE(ab3100_devs); i++) {
+        for (i = 0; i < ARRAY_SIZE(ab3100_devs); i++)
                 ab3100_devs[i].platform_data = ab3100_plf_data;
-                ab3100_devs[i].data_size = sizeof(struct ab3100_platform_data);
-        }
 
         err = mfd_add_devices(&client->dev, 0, ab3100_devs,
                 ARRAY_SIZE(ab3100_devs), NULL, 0);
diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c
index ed6feaf9398d..2dec589a8908 100644
--- a/drivers/regulator/ab3100.c
+++ b/drivers/regulator/ab3100.c
@@ -17,6 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/driver.h>
 #include <linux/mfd/abx500.h>
+#include <linux/mfd/core.h>
 
 /* LDO registers and some handy masking definitions for AB3100 */
 #define AB3100_LDO_A            0x40
@@ -576,7 +577,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = {
 
 static int __devinit ab3100_regulators_probe(struct platform_device *pdev)
 {
-        struct ab3100_platform_data *plfdata = pdev->dev.platform_data;
+        struct ab3100_platform_data *plfdata = mfd_get_data(pdev);
         int err = 0;
         u8 data;
         int i;