ASoC: mediatek: mt8173-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-9-wenst@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
index f93d6348fdf89aead9321926169c57d5439e52a0..c0fa623e0b17325188933d38921581cea13293da 100644 (file)
--- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
+++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
@@ -1054,26 +1054,26 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)
        struct mtk_base_afe *afe;
        struct mt8173_afe_private *afe_priv;
        struct snd_soc_component *comp_pcm, *comp_hdmi;
+       struct device *dev = &pdev->dev;
 
-       ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(33));
+       ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(33));
        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;
 
-       afe->platform_priv = devm_kzalloc(&pdev->dev, sizeof(*afe_priv),
-                                         GFP_KERNEL);
+       afe->platform_priv = devm_kzalloc(dev, sizeof(*afe_priv), GFP_KERNEL);
        afe_priv = afe->platform_priv;
        if (!afe_priv)
                return -ENOMEM;
 
-       afe->dev = &pdev->dev;
+       afe->dev = dev;
 
-       ret = of_reserved_mem_device_init(&pdev->dev);
+       ret = of_reserved_mem_device_init(dev);
        if (ret) {
-               dev_info(&pdev->dev, "no reserved memory found, pre-allocating buffers instead\n");
+               dev_info(dev, "no reserved memory found, pre-allocating buffers instead\n");
                afe->preallocate_buffers = true;
        }
 
@@ -1085,27 +1085,27 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)
        if (IS_ERR(afe->base_addr))
                return PTR_ERR(afe->base_addr);
 
-       afe->regmap = devm_regmap_init_mmio(&pdev->dev, afe->base_addr,
-               &mt8173_afe_regmap_config);
+       afe->regmap = devm_regmap_init_mmio(dev, afe->base_addr,
+                                           &mt8173_afe_regmap_config);
        if (IS_ERR(afe->regmap))
                return PTR_ERR(afe->regmap);
 
        /* initial audio related clock */
        ret = mt8173_afe_init_audio_clk(afe);
        if (ret) {
-               dev_err(afe->dev, "mt8173_afe_init_audio_clk fail\n");
+               dev_err(dev, "mt8173_afe_init_audio_clk fail\n");
                return ret;
        }
 
        /* memif % irq initialize*/
        afe->memif_size = MT8173_AFE_MEMIF_NUM;
-       afe->memif = devm_kcalloc(afe->dev, afe->memif_size,
+       afe->memif = devm_kcalloc(dev, afe->memif_size,
                                  sizeof(*afe->memif), GFP_KERNEL);
        if (!afe->memif)
                return -ENOMEM;
 
        afe->irqs_size = MT8173_AFE_IRQ_NUM;
-       afe->irqs = devm_kcalloc(afe->dev, afe->irqs_size,
+       afe->irqs = devm_kcalloc(dev, afe->irqs_size,
                                 sizeof(*afe->irqs), GFP_KERNEL);
        if (!afe->irqs)
                return -ENOMEM;
@@ -1124,9 +1124,9 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, afe);
 
-       pm_runtime_enable(&pdev->dev);
-       if (!pm_runtime_enabled(&pdev->dev)) {
-               ret = mt8173_afe_runtime_resume(&pdev->dev);
+       pm_runtime_enable(dev);
+       if (!pm_runtime_enabled(dev)) {
+               ret = mt8173_afe_runtime_resume(dev);
                if (ret)
                        goto err_pm_disable;
        }
@@ -1136,13 +1136,12 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)
        afe->runtime_resume = mt8173_afe_runtime_resume;
        afe->runtime_suspend = mt8173_afe_runtime_suspend;
 
-       ret = devm_snd_soc_register_component(&pdev->dev,
-                                        &mtk_afe_pcm_platform,
-                                        NULL, 0);
+       ret = devm_snd_soc_register_component(dev, &mtk_afe_pcm_platform,
+                                             NULL, 0);
        if (ret)
                goto err_pm_disable;
 
-       comp_pcm = devm_kzalloc(&pdev->dev, sizeof(*comp_pcm), GFP_KERNEL);
+       comp_pcm = devm_kzalloc(dev, sizeof(*comp_pcm), GFP_KERNEL);
        if (!comp_pcm) {
                ret = -ENOMEM;
                goto err_pm_disable;
@@ -1150,7 +1149,7 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)
 
        ret = snd_soc_component_initialize(comp_pcm,
                                           &mt8173_afe_pcm_dai_component,
-                                          &pdev->dev);
+                                          dev);
        if (ret)
                goto err_pm_disable;
 
@@ -1164,7 +1163,7 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)
        if (ret)
                goto err_pm_disable;
 
-       comp_hdmi = devm_kzalloc(&pdev->dev, sizeof(*comp_hdmi), GFP_KERNEL);
+       comp_hdmi = devm_kzalloc(dev, sizeof(*comp_hdmi), GFP_KERNEL);
        if (!comp_hdmi) {
                ret = -ENOMEM;
                goto err_cleanup_components;
@@ -1172,7 +1171,7 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)
 
        ret = snd_soc_component_initialize(comp_hdmi,
                                           &mt8173_afe_hdmi_dai_component,
-                                          &pdev->dev);
+                                          dev);
        if (ret)
                goto err_cleanup_components;
 
@@ -1186,30 +1185,32 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)
        if (ret)
                goto err_cleanup_components;
 
-       ret = devm_request_irq(afe->dev, irq_id, mt8173_afe_irq_handler,
+       ret = devm_request_irq(dev, irq_id, mt8173_afe_irq_handler,
                               0, "Afe_ISR_Handle", (void *)afe);
        if (ret) {
-               dev_err(afe->dev, "could not request_irq\n");
+               dev_err(dev, "could not request_irq\n");
                goto err_cleanup_components;
        }
 
-       dev_info(&pdev->dev, "MT8173 AFE driver initialized.\n");
+       dev_info(dev, "MT8173 AFE driver initialized.\n");
        return 0;
 
 err_cleanup_components:
-       snd_soc_unregister_component(&pdev->dev);
+       snd_soc_unregister_component(dev);
 err_pm_disable:
-       pm_runtime_disable(&pdev->dev);
+       pm_runtime_disable(dev);
        return ret;
 }
 
 static void mt8173_afe_pcm_dev_remove(struct platform_device *pdev)
 {
-       snd_soc_unregister_component(&pdev->dev);
+       struct device *dev = &pdev->dev;
 
-       pm_runtime_disable(&pdev->dev);
-       if (!pm_runtime_status_suspended(&pdev->dev))
-               mt8173_afe_runtime_suspend(&pdev->dev);
+       snd_soc_unregister_component(dev);
+
+       pm_runtime_disable(dev);
+       if (!pm_runtime_status_suspended(dev))
+               mt8173_afe_runtime_suspend(dev);
 }
 
 static const struct of_device_id mt8173_afe_pcm_dt_match[] = {