Merge tag 'sound-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / codecs / lpass-va-macro.c

diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c
index 3d6976a3d9e42171208e56faa5da68631fb38fce..56c93f4465c9c9c8286bebeb96b953c5de70b1d4 100644 (file)
--- a/sound/soc/codecs/lpass-va-macro.c
+++ b/sound/soc/codecs/lpass-va-macro.c
@@ -894,7 +894,7 @@ static int va_macro_digital_mute(struct snd_soc_dai *dai, int mute, int stream)
        return 0;
 }
 
-static struct snd_soc_dai_ops va_macro_dai_ops = {
+static const struct snd_soc_dai_ops va_macro_dai_ops = {
        .hw_params = va_macro_hw_params,
        .get_channel_map = va_macro_get_channel_map,
        .mute_stream = va_macro_digital_mute,
@@ -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;