aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/codecs/lpass-va-macro.c
diff options
context:
space:
mode:
authorJerome Brunet <jbrunet@baylibre.com>2021-04-21 14:05:11 +0200
committerMark Brown <broonie@kernel.org>2021-04-23 13:16:26 +0100
commit27dc72b44e85997dfd5f3b120e5ec847c43c272a (patch)
tree0ddef80c3be41f6db1b26d435fe549b0cba71835 /sound/soc/codecs/lpass-va-macro.c
parentASoC: rt5682: clock driver must use the clock provider API (diff)
downloadwireguard-linux-27dc72b44e85997dfd5f3b120e5ec847c43c272a.tar.xz
wireguard-linux-27dc72b44e85997dfd5f3b120e5ec847c43c272a.zip
ASoC: lpass: use the clock provider API
Clock providers should be registered using the clk_hw API. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Link: https://lore.kernel.org/r/20210421120512.413057-5-jbrunet@baylibre.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/lpass-va-macro.c')
-rw-r--r--sound/soc/codecs/lpass-va-macro.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c
index 5294c57b2cd4..56c93f4465c9 100644
--- a/sound/soc/codecs/lpass-va-macro.c
+++ b/sound/soc/codecs/lpass-va-macro.c
@@ -1343,7 +1343,7 @@ static int va_macro_register_fsgen_output(struct va_macro *va)
if (ret)
return ret;
- return of_clk_add_provider(np, of_clk_src_simple_get, va->hw.clk);
+ return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, &va->hw);
}
static int va_macro_validate_dmic_sample_rate(u32 dmic_sample_rate,
@@ -1452,12 +1452,10 @@ static int va_macro_probe(struct platform_device *pdev)
va_macro_dais,
ARRAY_SIZE(va_macro_dais));
if (ret)
- goto soc_err;
+ goto err;
return ret;
-soc_err:
- of_clk_del_provider(pdev->dev.of_node);
err:
clk_bulk_disable_unprepare(VA_NUM_CLKS_MAX, va->clks);
@@ -1468,7 +1466,6 @@ static int va_macro_remove(struct platform_device *pdev)
{
struct va_macro *va = dev_get_drvdata(&pdev->dev);
- of_clk_del_provider(pdev->dev.of_node);
clk_bulk_disable_unprepare(VA_NUM_CLKS_MAX, va->clks);
return 0;