mfd: mfd_cell is now implicitly available to mc13xxx 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.

Note that mfd-core no longer makes a copy of platform_data, but the
mc13xxx-core driver creates the pdata structures on the stack.  In
order to get around that, the various ARM mach types that set the
pdata have been changed to hold the variable in static (global) memory.
Also note that __initdata references in aforementioned pdata structs
have been dropped.

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

2 files changed, 6 insertions, 8 deletions

diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c
index 3e5d0c3b4e53..23249cb0a8bd 100644
--- a/drivers/regulator/mc13783-regulator.c
+++ b/drivers/regulator/mc13783-regulator.c
@@ -15,6 +15,7 @@
 #include <linux/regulator/driver.h>
 #include <linux/platform_device.h>
 #include <linux/kernel.h>
+#include <linux/mfd/core.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/err.h>
@@ -336,8 +337,7 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
 {
         struct mc13xxx_regulator_priv *priv;
         struct mc13xxx *mc13783 = dev_get_drvdata(pdev->dev.parent);
-        struct mc13783_regulator_platform_data *pdata =
-                dev_get_platdata(&pdev->dev);
+        struct mc13783_regulator_platform_data *pdata = mfd_get_data(pdev);
         struct mc13783_regulator_init_data *init_data;
         int i, ret;
 
@@ -381,8 +381,7 @@ err:
 static int __devexit mc13783_regulator_remove(struct platform_device *pdev)
 {
         struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
-        struct mc13783_regulator_platform_data *pdata =
-                dev_get_platdata(&pdev->dev);
+        struct mc13783_regulator_platform_data *pdata = mfd_get_data(pdev);
         int i;
 
         platform_set_drvdata(pdev, NULL);
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
index 1b8f7398a4a8..6f15168e5ed4 100644
--- a/drivers/regulator/mc13892-regulator.c
+++ b/drivers/regulator/mc13892-regulator.c
@@ -15,6 +15,7 @@
 #include <linux/regulator/driver.h>
 #include <linux/platform_device.h>
 #include <linux/kernel.h>
+#include <linux/mfd/core.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/err.h>
@@ -520,8 +521,7 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
 {
         struct mc13xxx_regulator_priv *priv;
         struct mc13xxx *mc13892 = dev_get_drvdata(pdev->dev.parent);
-        struct mc13xxx_regulator_platform_data *pdata =
-                dev_get_platdata(&pdev->dev);
+        struct mc13xxx_regulator_platform_data *pdata = mfd_get_data(pdev);
         struct mc13xxx_regulator_init_data *init_data;
         int i, ret;
         u32 val;
@@ -595,8 +595,7 @@ err_free:
 static int __devexit mc13892_regulator_remove(struct platform_device *pdev)
 {
         struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
-        struct mc13xxx_regulator_platform_data *pdata =
-                dev_get_platdata(&pdev->dev);
+        struct mc13xxx_regulator_platform_data *pdata = mfd_get_data(pdev);
         int i;
 
         platform_set_drvdata(pdev, NULL);