ASoC: mediatek: mt8188: combine afe component registration

There is no benefit to separate two components for AFE, so DAI driver
registration is moved to dev_snd_soc_register_component to merge these
two components.

Signed-off-by: Trevor Wu <trevor.wu@mediatek.com
Link: https://lore.kernel.org/r/20230510035526.18137-6-trevor.wu@mediatek.com
Signed-off-by: Mark Brown <broonie@kernel.org

diff --git a/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c b/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c
index e5f9373..fecc891 100644 (file)
--- a/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c
+++ b/sound/soc/mediatek/mt8188/mt8188-afe-pcm.c
@@ -1898,10 +1898,6 @@ static const struct snd_kcontrol_new mt8188_memif_controls[] = {
                            MT8188_AFE_MEMIF_UL10),
 };
 
-static const struct snd_soc_component_driver mt8188_afe_pcm_dai_component = {
-       .name = "mt8188-afe-pcm-dai",
-};
-
 static const struct mtk_base_memif_data memif_data[MT8188_AFE_MEMIF_NUM] = {
        [MT8188_AFE_MEMIF_DL2] = {
                .name = "DL2",
@@ -3142,9 +3138,8 @@ static int mt8188_afe_pcm_dev_probe(struct platform_device *pdev)
        struct mtk_base_afe *afe;
        struct mt8188_afe_private *afe_priv;
        struct device *dev;
-       int i, irq_id, ret;
-       struct snd_soc_component *component;
        struct reset_control *rstc;
+       int i, irq_id, ret;
 
        ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(33));
        if (ret)
@@ -3280,34 +3275,12 @@ static int mt8188_afe_pcm_dev_probe(struct platform_device *pdev)
 
        /* register component */
        ret = devm_snd_soc_register_component(dev, &mt8188_afe_component,
-                                             NULL, 0);
+                                             afe->dai_drivers, afe->num_dai_drivers);
        if (ret) {
                dev_warn(dev, "err_platform\n");
                goto err_pm_put;
        }
 
-       component = devm_kzalloc(&pdev->dev, sizeof(*component), GFP_KERNEL);
-       if (!component) {
-               ret = -ENOMEM;
-               goto err_pm_put;
-       }
-
-       ret = snd_soc_component_initialize(component,
-                                          &mt8188_afe_pcm_dai_component,
-                                          &pdev->dev);
-       if (ret)
-               goto err_pm_put;
-#ifdef CONFIG_DEBUG_FS
-       component->debugfs_prefix = "pcm";
-#endif
-       ret = snd_soc_add_component(component,
-                                   afe->dai_drivers,
-                                   afe->num_dai_drivers);
-       if (ret) {
-               dev_warn(dev, "err_add_component\n");
-               goto err_pm_put;
-       }
-
        mt8188_afe_init_registers(afe);
 
        pm_runtime_put_sync(&pdev->dev);
@@ -3323,11 +3296,6 @@ err_pm_put:
        return ret;
 }
 
-static void mt8188_afe_pcm_dev_remove(struct platform_device *pdev)
-{
-       snd_soc_unregister_component(&pdev->dev);
-}
-
 static const struct of_device_id mt8188_afe_pcm_dt_match[] = {
        { .compatible = "mediatek,mt8188-afe", },
        {},
@@ -3346,7 +3314,6 @@ static struct platform_driver mt8188_afe_pcm_driver = {
                   .pm = &mt8188_afe_pm_ops,
        },
        .probe = mt8188_afe_pcm_dev_probe,
-       .remove_new = mt8188_afe_pcm_dev_remove,
 };
 
 module_platform_driver(mt8188_afe_pcm_driver);