ASoC: mediatek: move .suspend/.resume to component

There is no big difference at implementation for .suspend/.resume
between DAI driver and Component driver.
But because some driver is using DAI version, thus ALSA SoC needs
to keep supporting it, hence, framework becoming verbose.
If we can switch all DAI driver .suspend/.resume to Component driver,
we can remove verbose code from ALSA SoC.

Driver is getting its private data via dai->dev.
But dai->dev and component->dev are same dev, thus, we can convert
these. For same reason, we can convert dai->active to
component->active if necessary.

This patch moves DAI driver .suspend/.resume to Component driver

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/877e1nym4e.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/mediatek/common/mtk-afe-fe-dai.c b/sound/soc/mediatek/common/mtk-afe-fe-dai.c
index 8f314e15ce733d314021840519716f2a8766197e..4254f3a954dd5f2b8d240f5c356e78a9c3067283 100644 (file)
--- a/sound/soc/mediatek/common/mtk-afe-fe-dai.c
+++ b/sound/soc/mediatek/common/mtk-afe-fe-dai.c
@@ -319,9 +319,9 @@ int mtk_dynamic_irq_release(struct mtk_base_afe *afe, int irq_id)
 }
 EXPORT_SYMBOL_GPL(mtk_dynamic_irq_release);
 
-int mtk_afe_dai_suspend(struct snd_soc_dai *dai)
+int mtk_afe_suspend(struct snd_soc_component *component)
 {
-       struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
+       struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
        struct device *dev = afe->dev;
        struct regmap *regmap = afe->regmap;
        int i;
@@ -342,11 +342,11 @@ int mtk_afe_dai_suspend(struct snd_soc_dai *dai)
        afe->runtime_suspend(dev);
        return 0;
 }
-EXPORT_SYMBOL_GPL(mtk_afe_dai_suspend);
+EXPORT_SYMBOL_GPL(mtk_afe_suspend);
 
-int mtk_afe_dai_resume(struct snd_soc_dai *dai)
+int mtk_afe_resume(struct snd_soc_component *component)
 {
-       struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
+       struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);
        struct device *dev = afe->dev;
        struct regmap *regmap = afe->regmap;
        int i = 0;
@@ -366,7 +366,7 @@ int mtk_afe_dai_resume(struct snd_soc_dai *dai)
        afe->suspended = false;
        return 0;
 }
-EXPORT_SYMBOL_GPL(mtk_afe_dai_resume);
+EXPORT_SYMBOL_GPL(mtk_afe_resume);
 
 int mtk_memif_set_enable(struct mtk_base_afe *afe, int id)
 {

diff --git a/sound/soc/mediatek/common/mtk-afe-fe-dai.h b/sound/soc/mediatek/common/mtk-afe-fe-dai.h
index 507e3e7c3c7dda78b797244ad6fc541b23da87a4..8cec906718279dcfd7c8d7ccc50d21feb0b71923 100644 (file)
--- a/sound/soc/mediatek/common/mtk-afe-fe-dai.h
+++ b/sound/soc/mediatek/common/mtk-afe-fe-dai.h
@@ -31,8 +31,8 @@ extern const struct snd_soc_dai_ops mtk_afe_fe_ops;
 
 int mtk_dynamic_irq_acquire(struct mtk_base_afe *afe);
 int mtk_dynamic_irq_release(struct mtk_base_afe *afe, int irq_id);
-int mtk_afe_dai_suspend(struct snd_soc_dai *dai);
-int mtk_afe_dai_resume(struct snd_soc_dai *dai);
+int mtk_afe_suspend(struct snd_soc_component *component);
+int mtk_afe_resume(struct snd_soc_component *component);
 
 int mtk_memif_set_enable(struct mtk_base_afe *afe, int id);
 int mtk_memif_set_disable(struct mtk_base_afe *afe, int id);

diff --git a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
index 76502ba261c810e3b79d570f0b5016727dd0b663..488603a0c4b1ba8d912b4ada00ca4d93aab75321 100644 (file)
--- a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
+++ b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
@@ -549,8 +549,6 @@ static struct snd_soc_dai_driver mt2701_afe_pcm_dais[] = {
        {
                .name = "PCMO0",
                .id = MT2701_MEMIF_DL1,
-               .suspend = mtk_afe_dai_suspend,
-               .resume = mtk_afe_dai_resume,
                .playback = {
                        .stream_name = "DL1",
                        .channels_min = 1,
@@ -565,8 +563,6 @@ static struct snd_soc_dai_driver mt2701_afe_pcm_dais[] = {
        {
                .name = "PCM_multi",
                .id = MT2701_MEMIF_DLM,
-               .suspend = mtk_afe_dai_suspend,
-               .resume = mtk_afe_dai_resume,
                .playback = {
                        .stream_name = "DLM",
                        .channels_min = 1,
@@ -582,8 +578,6 @@ static struct snd_soc_dai_driver mt2701_afe_pcm_dais[] = {
        {
                .name = "PCM0",
                .id = MT2701_MEMIF_UL1,
-               .suspend = mtk_afe_dai_suspend,
-               .resume = mtk_afe_dai_resume,
                .capture = {
                        .stream_name = "UL1",
                        .channels_min = 1,
@@ -598,8 +592,6 @@ static struct snd_soc_dai_driver mt2701_afe_pcm_dais[] = {
        {
                .name = "PCM1",
                .id = MT2701_MEMIF_UL2,
-               .suspend = mtk_afe_dai_suspend,
-               .resume = mtk_afe_dai_resume,
                .capture = {
                        .stream_name = "UL2",
                        .channels_min = 1,
@@ -615,8 +607,6 @@ static struct snd_soc_dai_driver mt2701_afe_pcm_dais[] = {
        {
                .name = "PCM_BT_DL",
                .id = MT2701_MEMIF_DLBT,
-               .suspend = mtk_afe_dai_suspend,
-               .resume = mtk_afe_dai_resume,
                .playback = {
                        .stream_name = "DLBT",
                        .channels_min = 1,
@@ -630,8 +620,6 @@ static struct snd_soc_dai_driver mt2701_afe_pcm_dais[] = {
        {
                .name = "PCM_BT_UL",
                .id = MT2701_MEMIF_ULBT,
-               .suspend = mtk_afe_dai_suspend,
-               .resume = mtk_afe_dai_resume,
                .capture = {
                        .stream_name = "ULBT",
                        .channels_min = 1,
@@ -982,6 +970,8 @@ static const struct snd_soc_component_driver mt2701_afe_pcm_dai_component = {
        .num_dapm_widgets = ARRAY_SIZE(mt2701_afe_pcm_widgets),
        .dapm_routes = mt2701_afe_pcm_routes,
        .num_dapm_routes = ARRAY_SIZE(mt2701_afe_pcm_routes),
+       .suspend = mtk_afe_suspend,
+       .resume = mtk_afe_resume,
 };
 
 static const struct mtk_base_memif_data memif_data[MT2701_MEMIF_NUM] = {

diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
index 0ee29255e73198ae499c5e782f731a1395d1e26e..461e4de8c918e0d935fc7294c1e1b01852226bc3 100644 (file)
--- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
+++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
@@ -533,8 +533,6 @@ static struct snd_soc_dai_driver mt8173_afe_pcm_dais[] = {
        {
                .name = "DL1", /* downlink 1 */
                .id = MT8173_AFE_MEMIF_DL1,
-               .suspend = mtk_afe_dai_suspend,
-               .resume = mtk_afe_dai_resume,
                .playback = {
                        .stream_name = "DL1",
                        .channels_min = 1,
@@ -546,8 +544,6 @@ static struct snd_soc_dai_driver mt8173_afe_pcm_dais[] = {
        }, {
                .name = "VUL", /* voice uplink */
                .id = MT8173_AFE_MEMIF_VUL,
-               .suspend = mtk_afe_dai_suspend,
-               .resume = mtk_afe_dai_resume,
                .capture = {
                        .stream_name = "VUL",
                        .channels_min = 1,
@@ -584,8 +580,6 @@ static struct snd_soc_dai_driver mt8173_afe_hdmi_dais[] = {
        {
                .name = "HDMI",
                .id = MT8173_AFE_MEMIF_HDMI,
-               .suspend = mtk_afe_dai_suspend,
-               .resume = mtk_afe_dai_resume,
                .playback = {
                        .stream_name = "HDMI",
                        .channels_min = 2,
@@ -681,12 +675,16 @@ static const struct snd_soc_component_driver mt8173_afe_pcm_dai_component = {
        .num_dapm_widgets = ARRAY_SIZE(mt8173_afe_pcm_widgets),
        .dapm_routes = mt8173_afe_pcm_routes,
        .num_dapm_routes = ARRAY_SIZE(mt8173_afe_pcm_routes),
+       .suspend = mtk_afe_suspend,
+       .resume = mtk_afe_resume,
 };
 
 static const struct snd_soc_component_driver mt8173_afe_hdmi_dai_component = {
        .name = "mt8173-afe-hdmi-dai",
        .dapm_routes = mt8173_afe_hdmi_routes,
        .num_dapm_routes = ARRAY_SIZE(mt8173_afe_hdmi_routes),
+       .suspend = mtk_afe_suspend,
+       .resume = mtk_afe_resume,
 };
 
 static const char *aud_clks[MT8173_CLK_NUM] = {