From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753589AbaF3O0f (ORCPT ); Mon, 30 Jun 2014 10:26:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65457 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753094AbaF3O0d (ORCPT ); Mon, 30 Jun 2014 10:26:33 -0400 From: Hans de Goede To: Mark Brown , Charles Keepax , Lee Jones , Samuel Ortiz , Liam Girdwood Cc: Carlo Caione , Maxime Ripard , Linux Kernel Mailing List , linux-sunxi@googlegroups.com, Hans de Goede Subject: [PATCH resend v2 3/3] arizona-mfd-codecs: Add mfd_register_supply_aliases() calls Date: Mon, 30 Jun 2014 16:26:09 +0200 Message-Id: <1404138369-23907-4-git-send-email-hdegoede@redhat.com> In-Reply-To: <1404138369-23907-1-git-send-email-hdegoede@redhat.com> References: <1404138369-23907-1-git-send-email-hdegoede@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 289b64d..82249c4 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -1829,6 +1830,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 2e5fcb5..786a64a 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -1665,6 +1666,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 bb9b47b..e7c9c4e 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -1110,7 +1111,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); -- 2.0.0