lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 305/667] ASoC: fsl: Use dev_err_probe() helper
    Date
    From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

    [ Upstream commit 2e6f557ca35aa330dbf31c5e1cc8119eff1526fa ]

    Use the dev_err_probe() helper, instead of open-coding the same
    operation.

    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Link: https://lore.kernel.org/r/20211214020843.2225831-14-kuninori.morimoto.gx@renesas.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/fsl/fsl-asoc-card.c | 3 +--
    sound/soc/fsl/imx-card.c | 17 ++++++-----------
    sound/soc/fsl/imx-sgtl5000.c | 4 +---
    sound/soc/fsl/imx-spdif.c | 4 ++--
    4 files changed, 10 insertions(+), 18 deletions(-)

    diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
    index 06107ae46e20..95286c839b57 100644
    --- a/sound/soc/fsl/fsl-asoc-card.c
    +++ b/sound/soc/fsl/fsl-asoc-card.c
    @@ -842,8 +842,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)

    ret = devm_snd_soc_register_card(&pdev->dev, &priv->card);
    if (ret) {
    - if (ret != -EPROBE_DEFER)
    - dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
    + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n");
    goto asrc_fail;
    }

    diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c
    index db947180617a..55bc1bb0dbbd 100644
    --- a/sound/soc/fsl/imx-card.c
    +++ b/sound/soc/fsl/imx-card.c
    @@ -579,9 +579,8 @@ static int imx_card_parse_of(struct imx_card_data *data)

    ret = snd_soc_of_get_dai_name(cpu, &link->cpus->dai_name);
    if (ret) {
    - if (ret != -EPROBE_DEFER)
    - dev_err(card->dev, "%s: error getting cpu dai name: %d\n",
    - link->name, ret);
    + dev_err_probe(card->dev, ret,
    + "%s: error getting cpu dai name\n", link->name);
    goto err;
    }

    @@ -589,9 +588,8 @@ static int imx_card_parse_of(struct imx_card_data *data)
    if (codec) {
    ret = snd_soc_of_get_dai_link_codecs(dev, codec, link);
    if (ret < 0) {
    - if (ret != -EPROBE_DEFER)
    - dev_err(dev, "%s: codec dai not found: %d\n",
    - link->name, ret);
    + dev_err_probe(dev, ret, "%s: codec dai not found\n",
    + link->name);
    goto err;
    }

    @@ -830,11 +828,8 @@ static int imx_card_probe(struct platform_device *pdev)
    }

    ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
    - if (ret) {
    - if (ret != -EPROBE_DEFER)
    - dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
    - return ret;
    - }
    + if (ret)
    + return dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n");

    return 0;
    }
    diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c
    index f45cb4bbb6c4..52bb1844f548 100644
    --- a/sound/soc/fsl/imx-sgtl5000.c
    +++ b/sound/soc/fsl/imx-sgtl5000.c
    @@ -173,9 +173,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)

    ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
    if (ret) {
    - if (ret != -EPROBE_DEFER)
    - dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
    - ret);
    + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n");
    goto fail;
    }

    diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c
    index 6c4dadf60355..4446fba755b9 100644
    --- a/sound/soc/fsl/imx-spdif.c
    +++ b/sound/soc/fsl/imx-spdif.c
    @@ -70,8 +70,8 @@ static int imx_spdif_audio_probe(struct platform_device *pdev)
    goto end;

    ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
    - if (ret && ret != -EPROBE_DEFER)
    - dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret);
    + if (ret)
    + dev_err_probe(&pdev->dev, ret, "snd_soc_register_card failed\n");

    end:
    of_node_put(spdif_np);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-07 20:53    [W:4.086 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site