| Message ID | 20210520014807.3749797-1-swboyd@chromium.org |
|---|---|
| State | Accepted |
| Commit | af2702549d68519ac78228e915d9b2c199056787 |
| Headers | show |
| Series | ASoC: qcom: lpass-cpu: Use optional clk APIs | expand |
Thanks Stephen for patch. On 20/05/2021 02:48, Stephen Boyd wrote: > This driver spits out a warning for me at boot: > > sc7180-lpass-cpu 62f00000.lpass: asoc_qcom_lpass_cpu_platform_probe() error getting optional null: -2 > > but it looks like it is all an optional clk. Use the optional clk APIs > here so that we don't see this message and everything else is the same. > > Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > Cc: Banajit Goswami <bgoswami@codeaurora.org> > Fixes: 3e53ac8230c1 ("ASoC: qcom: make osr clock optional") > Signed-off-by: Stephen Boyd <swboyd@chromium.org> Lgtm, Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --srini > --- > sound/soc/qcom/lpass-cpu.c | 12 +----------- > 1 file changed, 1 insertion(+), 11 deletions(-) > > diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c > index c62d2612e8f5..28c7497344e3 100644 > --- a/sound/soc/qcom/lpass-cpu.c > +++ b/sound/soc/qcom/lpass-cpu.c > @@ -835,18 +835,8 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) > if (dai_id == LPASS_DP_RX) > continue; > > - drvdata->mi2s_osr_clk[dai_id] = devm_clk_get(dev, > + drvdata->mi2s_osr_clk[dai_id] = devm_clk_get_optional(dev, > variant->dai_osr_clk_names[i]); > - if (IS_ERR(drvdata->mi2s_osr_clk[dai_id])) { > - dev_warn(dev, > - "%s() error getting optional %s: %ld\n", > - __func__, > - variant->dai_osr_clk_names[i], > - PTR_ERR(drvdata->mi2s_osr_clk[dai_id])); > - > - drvdata->mi2s_osr_clk[dai_id] = NULL; > - } > - > drvdata->mi2s_bit_clk[dai_id] = devm_clk_get(dev, > variant->dai_bit_clk_names[i]); > if (IS_ERR(drvdata->mi2s_bit_clk[dai_id])) { > > base-commit: 6efb943b8616ec53a5e444193dccf1af9ad627b5 >
diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index c62d2612e8f5..28c7497344e3 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -835,18 +835,8 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) if (dai_id == LPASS_DP_RX) continue; - drvdata->mi2s_osr_clk[dai_id] = devm_clk_get(dev, + drvdata->mi2s_osr_clk[dai_id] = devm_clk_get_optional(dev, variant->dai_osr_clk_names[i]); - if (IS_ERR(drvdata->mi2s_osr_clk[dai_id])) { - dev_warn(dev, - "%s() error getting optional %s: %ld\n", - __func__, - variant->dai_osr_clk_names[i], - PTR_ERR(drvdata->mi2s_osr_clk[dai_id])); - - drvdata->mi2s_osr_clk[dai_id] = NULL; - } - drvdata->mi2s_bit_clk[dai_id] = devm_clk_get(dev, variant->dai_bit_clk_names[i]); if (IS_ERR(drvdata->mi2s_bit_clk[dai_id])) {
This driver spits out a warning for me at boot: sc7180-lpass-cpu 62f00000.lpass: asoc_qcom_lpass_cpu_platform_probe() error getting optional null: -2 but it looks like it is all an optional clk. Use the optional clk APIs here so that we don't see this message and everything else is the same. Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Cc: Banajit Goswami <bgoswami@codeaurora.org> Fixes: 3e53ac8230c1 ("ASoC: qcom: make osr clock optional") Signed-off-by: Stephen Boyd <swboyd@chromium.org> --- sound/soc/qcom/lpass-cpu.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) base-commit: 6efb943b8616ec53a5e444193dccf1af9ad627b5