mfd: Remove unused LDO supply field from WM8994 pdata

It's causing confusion with the regulator level field of the same name
and serves no useful function.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index cd3c97e2ee75045afb4a855f7adf03066bca478b..e1ea2ffb6c0244c0ed414844f907431b11c1c218 100644 (file)
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -16,6 +16,8 @@
 #include <linux/mfd/wm831x/gpio.h>
 #include <linux/mfd/wm8994/pdata.h>
 
+#include <linux/regulator/machine.h>
+
 #include <sound/wm5100.h>
 #include <sound/wm8996.h>
 #include <sound/wm8962.h>
@@ -141,8 +143,8 @@ static struct wm8994_pdata wm8994_pdata = {
        },
        .irq_base = CODEC_IRQ_BASE,
        .ldo = {
-               { .supply = "WALLVDD" },
-               { .supply = "WALLVDD" },
+                { },
+                { },
        },
 };
 

diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h
index 3fb1f407d5e6e36cf0c9cff31d222bff0258b91f..4c1fb71c8107d97b70a3cb0e8d1d0e2f7ffb8e19 100644 (file)
--- a/include/linux/mfd/wm8994/pdata.h
+++ b/include/linux/mfd/wm8994/pdata.h
@@ -22,7 +22,6 @@ struct wm8994_ldo_pdata {
        /** GPIOs to enable regulator, 0 or less if not available */
        int enable;
 
-       const char *supply;
        const struct regulator_init_data *init_data;
 };