The mfd-core no longer registers the supply aliases, instead the platform driver probe method must now call mfd_register_supply_aliases().
Signed-off-by: Hans de Goede <[email protected]> --- sound/soc/codecs/wm5102.c | 5 +++++ sound/soc/codecs/wm5110.c | 5 +++++ sound/soc/codecs/wm8997.c | 7 ++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index dcf1d12..fab08cc 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -26,6 +26,7 @@ #include <sound/initval.h> #include <sound/tlv.h> +#include <linux/mfd/core.h> #include <linux/mfd/arizona/core.h> #include <linux/mfd/arizona/registers.h> @@ -1825,6 +1826,10 @@ static int wm5102_probe(struct platform_device *pdev) struct wm5102_priv *wm5102; int i, ret; + ret = mfd_register_supply_aliases(pdev); + if (ret) + return ret; + wm5102 = devm_kzalloc(&pdev->dev, sizeof(struct wm5102_priv), GFP_KERNEL); if (wm5102 == NULL) diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index df5a38d..a1a6923 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -26,6 +26,7 @@ #include <sound/initval.h> #include <sound/tlv.h> +#include <linux/mfd/core.h> #include <linux/mfd/arizona/core.h> #include <linux/mfd/arizona/registers.h> @@ -1656,6 +1657,10 @@ static int wm5110_probe(struct platform_device *pdev) struct wm5110_priv *wm5110; int i, ret; + ret = mfd_register_supply_aliases(pdev); + if (ret) + return ret; + wm5110 = devm_kzalloc(&pdev->dev, sizeof(struct wm5110_priv), GFP_KERNEL); if (wm5110 == NULL) diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c index 004186b..099b148 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -26,6 +26,7 @@ #include <sound/initval.h> #include <sound/tlv.h> +#include <linux/mfd/core.h> #include <linux/mfd/arizona/core.h> #include <linux/mfd/arizona/registers.h> @@ -1107,7 +1108,11 @@ static int wm8997_probe(struct platform_device *pdev) { struct arizona *arizona = dev_get_drvdata(pdev->dev.parent); struct wm8997_priv *wm8997; - int i; + int i, ret; + + ret = mfd_register_supply_aliases(pdev); + if (ret) + return ret; wm8997 = devm_kzalloc(&pdev->dev, sizeof(struct wm8997_priv), GFP_KERNEL); -- 1.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
