lkml.org 
[lkml]   [2021]   [May]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 272/296] ASoC: qcom: lpass-cpu: Use optional clk APIs
    Date
    From: Stephen Boyd <swboyd@chromium.org>

    [ Upstream commit af2702549d68519ac78228e915d9b2c199056787 ]

    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>
    Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Link: https://lore.kernel.org/r/20210520014807.3749797-1-swboyd@chromium.org
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 be360a402b67..936384a94f25 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])) {
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-31 18:49    [W:4.208 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site