lkml.org 
[lkml]   [2024]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/22] ASoC: mediatek: mt8192-afe-pcm: Simplify with dev_err_probe()
    Date
    Simplify the probe function by switching error prints to return
    dev_err_probe(), lowering the lines count; while at it, also
    beautify some messages and change some others' level from warn
    to error.

    Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
    ---
    sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 65 ++++++++--------------
    1 file changed, 22 insertions(+), 43 deletions(-)

    diff --git a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c b/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c
    index 794419d16b01..aed22baef9fb 100644
    --- a/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c
    +++ b/sound/soc/mediatek/mt8192/mt8192-afe-pcm.c
    @@ -2205,17 +2205,12 @@ static int mt8192_afe_pcm_dev_probe(struct platform_device *pdev)

    /* reset controller to reset audio regs before regmap cache */
    rstc = devm_reset_control_get_exclusive(dev, "audiosys");
    - if (IS_ERR(rstc)) {
    - ret = PTR_ERR(rstc);
    - dev_err(dev, "could not get audiosys reset:%d\n", ret);
    - return ret;
    - }
    + if (IS_ERR(rstc))
    + return dev_err_probe(dev, PTR_ERR(rstc), "could not get audiosys reset\n");

    ret = reset_control_reset(rstc);
    - if (ret) {
    - dev_err(dev, "failed to trigger audio reset:%d\n", ret);
    - return ret;
    - }
    + if (ret)
    + return dev_err_probe(dev, ret, "failed to trigger audio reset\n");

    ret = devm_pm_runtime_enable(&pdev->dev);
    if (ret)
    @@ -2223,25 +2218,21 @@ static int mt8192_afe_pcm_dev_probe(struct platform_device *pdev)

    /* regmap init */
    afe->regmap = syscon_node_to_regmap(dev->parent->of_node);
    - if (IS_ERR(afe->regmap)) {
    - dev_err(dev, "could not get regmap from parent\n");
    - return PTR_ERR(afe->regmap);
    - }
    + if (IS_ERR(afe->regmap))
    + return dev_err_probe(dev, PTR_ERR(afe->regmap),
    + "could not get regmap from parent");
    +
    ret = regmap_attach_dev(dev, afe->regmap, &mt8192_afe_regmap_config);
    - if (ret) {
    - dev_warn(dev, "regmap_attach_dev fail, ret %d\n", ret);
    - return ret;
    - }
    + if (ret)
    + return dev_err_probe(dev, ret, "regmap_attach_dev fail\n");

    /* enable clock for regcache get default value from hw */
    afe_priv->pm_runtime_bypass_reg_ctl = true;
    pm_runtime_get_sync(&pdev->dev);

    ret = regmap_reinit_cache(afe->regmap, &mt8192_afe_regmap_config);
    - if (ret) {
    - dev_err(dev, "regmap_reinit_cache fail, ret %d\n", ret);
    - return ret;
    - }
    + if (ret)
    + return dev_err_probe(dev, ret, "regmap_reinit_cache fail\n");

    pm_runtime_put_sync(&pdev->dev);
    afe_priv->pm_runtime_bypass_reg_ctl = false;
    @@ -2281,30 +2272,22 @@ static int mt8192_afe_pcm_dev_probe(struct platform_device *pdev)

    ret = devm_request_irq(dev, irq_id, mt8192_afe_irq_handler,
    IRQF_TRIGGER_NONE, "asys-isr", (void *)afe);
    - if (ret) {
    - dev_err(dev, "could not request_irq for Afe_ISR_Handle\n");
    - return ret;
    - }
    + if (ret)
    + return dev_err_probe(dev, ret, "could not request_irq for Afe_ISR_Handle\n");

    /* init sub_dais */
    INIT_LIST_HEAD(&afe->sub_dais);

    for (i = 0; i < ARRAY_SIZE(dai_register_cbs); i++) {
    ret = dai_register_cbs[i](afe);
    - if (ret) {
    - dev_warn(afe->dev, "dai register i %d fail, ret %d\n",
    - i, ret);
    - return ret;
    - }
    + if (ret)
    + return dev_err_probe(afe->dev, ret, "dai %d register fail", i);
    }

    /* init dai_driver and component_driver */
    ret = mtk_afe_combine_sub_dai(afe);
    - if (ret) {
    - dev_warn(afe->dev, "mtk_afe_combine_sub_dai fail, ret %d\n",
    - ret);
    - return ret;
    - }
    + if (ret)
    + return dev_err_probe(afe->dev, ret, "mtk_afe_combine_sub_dai fail\n");

    /* others */
    afe->mtk_afe_hardware = &mt8192_afe_hardware;
    @@ -2320,19 +2303,15 @@ static int mt8192_afe_pcm_dev_probe(struct platform_device *pdev)
    /* register platform */
    ret = devm_snd_soc_register_component(&pdev->dev,
    &mt8192_afe_component, NULL, 0);
    - if (ret) {
    - dev_warn(dev, "err_platform\n");
    - return ret;
    - }
    + if (ret)
    + return dev_err_probe(dev, ret, "Couldn't register AFE component\n");

    ret = devm_snd_soc_register_component(&pdev->dev,
    &mt8192_afe_pcm_component,
    afe->dai_drivers,
    afe->num_dai_drivers);
    - if (ret) {
    - dev_warn(dev, "err_dai_component\n");
    - return ret;
    - }
    + if (ret)
    + return dev_err_probe(dev, ret, "Couldn't register AFE-PCM component\n");

    return 0;
    }
    --
    2.44.0

    \
     
     \ /
      Last update: 2024-05-27 15:24    [W:4.337 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site