ASoC: mediatek: mt8183-afe-pcm: use local `dev` pointer in driver callbacks

The probe and remove functions in the mt8183-afe-pcm driver repeatedly uses
`&pdev->dev` for |struct device *|, but then assigns this value to
`afe->dev` and uses that in other places in the same function.

Store `&pdev->dev` in a local pointer and use that exclusively to avoid
the numerous dereferences and to make the code more consistent. Lines
are reflowed where it makes sense.

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Link: https://patch.msgid.link/20250612074901.4023253-10-wenst@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c b/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c
index 7383184097a48d73787a373c0e2bc3cc3cfa4a35..a7fef772760a6c58fcbda2f8503f9b203bf4444c 100644 (file)
--- a/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c
+++ b/sound/soc/mediatek/mt8183/mt8183-afe-pcm.c
@@ -770,27 +770,25 @@ static int mt8183_afe_pcm_dev_probe(struct platform_device *pdev)
 {
        struct mtk_base_afe *afe;
        struct mt8183_afe_private *afe_priv;
-       struct device *dev;
+       struct device *dev = &pdev->dev;
        struct reset_control *rstc;
        int i, irq_id, ret;
 
-       ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(34));
+       ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(34));
        if (ret)
                return ret;
 
-       afe = devm_kzalloc(&pdev->dev, sizeof(*afe), GFP_KERNEL);
+       afe = devm_kzalloc(dev, sizeof(*afe), GFP_KERNEL);
        if (!afe)
                return -ENOMEM;
        platform_set_drvdata(pdev, afe);
 
-       afe->platform_priv = devm_kzalloc(&pdev->dev, sizeof(*afe_priv),
-                                         GFP_KERNEL);
+       afe->platform_priv = devm_kzalloc(dev, sizeof(*afe_priv), GFP_KERNEL);
        if (!afe->platform_priv)
                return -ENOMEM;
 
        afe_priv = afe->platform_priv;
-       afe->dev = &pdev->dev;
-       dev = afe->dev;
+       afe->dev = dev;
 
        ret = of_reserved_mem_device_init(dev);
        if (ret) {
@@ -835,7 +833,7 @@ static int mt8183_afe_pcm_dev_probe(struct platform_device *pdev)
 
        /* enable clock for regcache get default value from hw */
        afe_priv->pm_runtime_bypass_reg_ctl = true;
-       pm_runtime_get_sync(&pdev->dev);
+       pm_runtime_get_sync(dev);
 
        ret = regmap_reinit_cache(afe->regmap, &mt8183_afe_regmap_config);
        if (ret) {
@@ -843,7 +841,7 @@ static int mt8183_afe_pcm_dev_probe(struct platform_device *pdev)
                goto err_pm_disable;
        }
 
-       pm_runtime_put_sync(&pdev->dev);
+       pm_runtime_put_sync(dev);
        afe_priv->pm_runtime_bypass_reg_ctl = false;
 
        regcache_cache_only(afe->regmap, true);
@@ -901,7 +899,7 @@ static int mt8183_afe_pcm_dev_probe(struct platform_device *pdev)
        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",
+                       dev_warn(dev, "dai register i %d fail, ret %d\n",
                                 i, ret);
                        goto err_pm_disable;
                }
@@ -910,8 +908,7 @@ static int mt8183_afe_pcm_dev_probe(struct platform_device *pdev)
        /* 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);
+               dev_warn(dev, "mtk_afe_combine_sub_dai fail, ret %d\n", ret);
                goto err_pm_disable;
        }
 
@@ -923,16 +920,14 @@ static int mt8183_afe_pcm_dev_probe(struct platform_device *pdev)
        afe->runtime_suspend = mt8183_afe_runtime_suspend;
 
        /* register component */
-       ret = devm_snd_soc_register_component(&pdev->dev,
-                                             &mtk_afe_pcm_platform,
+       ret = devm_snd_soc_register_component(dev, &mtk_afe_pcm_platform,
                                              NULL, 0);
        if (ret) {
                dev_warn(dev, "err_platform\n");
                goto err_pm_disable;
        }
 
-       ret = devm_snd_soc_register_component(afe->dev,
-                                             &mt8183_afe_pcm_dai_component,
+       ret = devm_snd_soc_register_component(dev, &mt8183_afe_pcm_dai_component,
                                              afe->dai_drivers,
                                              afe->num_dai_drivers);
        if (ret) {
@@ -943,15 +938,17 @@ static int mt8183_afe_pcm_dev_probe(struct platform_device *pdev)
        return ret;
 
 err_pm_disable:
-       pm_runtime_disable(&pdev->dev);
+       pm_runtime_disable(dev);
        return ret;
 }
 
 static void mt8183_afe_pcm_dev_remove(struct platform_device *pdev)
 {
-       pm_runtime_disable(&pdev->dev);
-       if (!pm_runtime_status_suspended(&pdev->dev))
-               mt8183_afe_runtime_suspend(&pdev->dev);
+       struct device *dev = &pdev->dev;
+
+       pm_runtime_disable(dev);
+       if (!pm_runtime_status_suspended(dev))
+               mt8183_afe_runtime_suspend(dev);
 }
 
 static const struct of_device_id mt8183_afe_pcm_dt_match[] = {