ASoC: uniphier: 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/87zhejx7j4.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/uniphier/aio-cpu.c b/sound/soc/uniphier/aio-cpu.c
index 2ae582a99b636e3637dd6f7c2200403627fadd23..fdaa6522720fb7ea5be899ee10046f81dfd357c3 100644 (file)
--- a/sound/soc/uniphier/aio-cpu.c
+++ b/sound/soc/uniphier/aio-cpu.c
@@ -420,25 +420,37 @@ int uniphier_aio_dai_remove(struct snd_soc_dai *dai)
 }
 EXPORT_SYMBOL_GPL(uniphier_aio_dai_remove);
 
-int uniphier_aio_dai_suspend(struct snd_soc_dai *dai)
+static void uniphier_aio_dai_suspend(struct snd_soc_dai *dai)
 {
        struct uniphier_aio *aio = uniphier_priv(dai);
 
+       if (!dai->active)
+               return;
+
        aio->chip->num_wup_aios--;
        if (!aio->chip->num_wup_aios) {
                reset_control_assert(aio->chip->rst);
                clk_disable_unprepare(aio->chip->clk);
        }
+}
+
+static int uniphier_aio_suspend(struct snd_soc_component *component)
+{
+       struct snd_soc_dai *dai;
 
+       for_each_component_dais(component, dai)
+               uniphier_aio_dai_suspend(dai);
        return 0;
 }
-EXPORT_SYMBOL_GPL(uniphier_aio_dai_suspend);
 
-int uniphier_aio_dai_resume(struct snd_soc_dai *dai)
+static int uniphier_aio_dai_resume(struct snd_soc_dai *dai)
 {
        struct uniphier_aio *aio = uniphier_priv(dai);
        int ret, i;
 
+       if (!dai->active)
+               return 0;
+
        if (!aio->chip->active)
                return 0;
 
@@ -484,7 +496,16 @@ err_out_clock:
 
        return ret;
 }
-EXPORT_SYMBOL_GPL(uniphier_aio_dai_resume);
+
+static int uniphier_aio_resume(struct snd_soc_component *component)
+{
+       struct snd_soc_dai *dai;
+       int ret = 0;
+
+       for_each_component_dais(component, dai)
+               ret |= uniphier_aio_dai_resume(dai);
+       return ret;
+}
 
 static int uniphier_aio_vol_info(struct snd_kcontrol *kcontrol,
                                 struct snd_ctl_elem_info *uinfo)
@@ -596,6 +617,8 @@ static const struct snd_soc_component_driver uniphier_aio_component = {
        .name = "uniphier-aio",
        .controls = uniphier_aio_controls,
        .num_controls = ARRAY_SIZE(uniphier_aio_controls),
+       .suspend = uniphier_aio_suspend,
+       .resume  = uniphier_aio_resume,
 };
 
 int uniphier_aio_probe(struct platform_device *pdev)

diff --git a/sound/soc/uniphier/aio-ld11.c b/sound/soc/uniphier/aio-ld11.c
index de962df245baa450872d5ec9cc87f90d88b3f665..8b44f8dc4970ca5e711854bb6973f76f6a0ef3dc 100644 (file)
--- a/sound/soc/uniphier/aio-ld11.c
+++ b/sound/soc/uniphier/aio-ld11.c
@@ -218,8 +218,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = {
                .name    = AUD_GNAME_HDMI,
                .probe   = uniphier_aio_ld11_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .playback = {
                        .stream_name = AUD_NAME_PCMOUT1,
                        .formats     = SNDRV_PCM_FMTBIT_S32_LE,
@@ -242,8 +240,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = {
                .name    = AUD_NAME_PCMIN2,
                .probe   = uniphier_aio_ld11_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .capture = {
                        .stream_name = AUD_NAME_PCMIN2,
                        .formats     = SNDRV_PCM_FMTBIT_S32_LE,
@@ -257,8 +253,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = {
                .name    = AUD_GNAME_LINE,
                .probe   = uniphier_aio_ld11_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .playback = {
                        .stream_name = AUD_NAME_PCMOUT2,
                        .formats     = SNDRV_PCM_FMTBIT_S32_LE,
@@ -279,8 +273,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = {
                .name    = AUD_NAME_HPCMOUT1,
                .probe   = uniphier_aio_ld11_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .playback = {
                        .stream_name = AUD_NAME_HPCMOUT1,
                        .formats     = SNDRV_PCM_FMTBIT_S32_LE,
@@ -294,8 +286,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = {
                .name    = AUD_NAME_PCMOUT3,
                .probe   = uniphier_aio_ld11_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .playback = {
                        .stream_name = AUD_NAME_PCMOUT3,
                        .formats     = SNDRV_PCM_FMTBIT_S32_LE,
@@ -309,8 +299,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = {
                .name    = AUD_NAME_HIECOUT1,
                .probe   = uniphier_aio_ld11_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .playback = {
                        .stream_name = AUD_NAME_HIECOUT1,
                        .formats     = SNDRV_PCM_FMTBIT_S32_LE,
@@ -324,8 +312,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = {
                .name    = AUD_NAME_EPCMOUT2,
                .probe   = uniphier_aio_ld11_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .playback = {
                        .stream_name = AUD_NAME_EPCMOUT2,
                        .formats     = SNDRV_PCM_FMTBIT_S32_LE,
@@ -341,8 +327,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = {
                .name    = AUD_NAME_EPCMOUT3,
                .probe   = uniphier_aio_ld11_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .playback = {
                        .stream_name = AUD_NAME_EPCMOUT3,
                        .formats     = SNDRV_PCM_FMTBIT_S32_LE,
@@ -358,8 +342,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_ld11[] = {
                .name    = AUD_NAME_HIECCOMPOUT1,
                .probe   = uniphier_aio_ld11_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .compress_new = snd_soc_new_compress,
                .playback = {
                        .stream_name = AUD_NAME_HIECCOMPOUT1,

diff --git a/sound/soc/uniphier/aio-pxs2.c b/sound/soc/uniphier/aio-pxs2.c
index 69cd5b0af94847ca8992c13e6e32dd5c52e01edb..a1d05fe9d3c28c108b3fa559213cd2e1e57e3527 100644 (file)
--- a/sound/soc/uniphier/aio-pxs2.c
+++ b/sound/soc/uniphier/aio-pxs2.c
@@ -171,8 +171,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = {
                .name    = AUD_GNAME_HDMI,
                .probe   = uniphier_aio_pxs2_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .playback = {
                        .stream_name = AUD_NAME_HPCMOUT1,
                        .formats     = SNDRV_PCM_FMTBIT_S32_LE,
@@ -186,8 +184,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = {
                .name    = AUD_GNAME_LINE,
                .probe   = uniphier_aio_pxs2_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .playback = {
                        .stream_name = AUD_NAME_PCMOUT1,
                        .formats     = SNDRV_PCM_FMTBIT_S32_LE,
@@ -208,8 +204,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = {
                .name    = AUD_GNAME_AUX,
                .probe   = uniphier_aio_pxs2_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .playback = {
                        .stream_name = AUD_NAME_PCMOUT2,
                        .formats     = SNDRV_PCM_FMTBIT_S32_LE,
@@ -230,8 +224,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = {
                .name    = AUD_NAME_HIECOUT1,
                .probe   = uniphier_aio_pxs2_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .playback = {
                        .stream_name = AUD_NAME_HIECOUT1,
                        .formats     = SNDRV_PCM_FMTBIT_S32_LE,
@@ -245,8 +237,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = {
                .name    = AUD_NAME_IECOUT1,
                .probe   = uniphier_aio_pxs2_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .playback = {
                        .stream_name = AUD_NAME_IECOUT1,
                        .formats     = SNDRV_PCM_FMTBIT_S32_LE,
@@ -260,8 +250,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = {
                .name    = AUD_NAME_HIECCOMPOUT1,
                .probe   = uniphier_aio_pxs2_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .compress_new = snd_soc_new_compress,
                .playback = {
                        .stream_name = AUD_NAME_HIECCOMPOUT1,
@@ -274,8 +262,6 @@ static struct snd_soc_dai_driver uniphier_aio_dai_pxs2[] = {
                .name    = AUD_NAME_IECCOMPOUT1,
                .probe   = uniphier_aio_pxs2_probe,
                .remove  = uniphier_aio_dai_remove,
-               .suspend = uniphier_aio_dai_suspend,
-               .resume  = uniphier_aio_dai_resume,
                .compress_new = snd_soc_new_compress,
                .playback = {
                        .stream_name = AUD_NAME_IECCOMPOUT1,

diff --git a/sound/soc/uniphier/aio.h b/sound/soc/uniphier/aio.h
index a7ff7e556429ba15345f54bfc94f71a1ef549f66..694ac030950e7b5ef7b4e8e312f839b3501950a2 100644 (file)
--- a/sound/soc/uniphier/aio.h
+++ b/sound/soc/uniphier/aio.h
@@ -308,8 +308,6 @@ extern const struct snd_compr_ops uniphier_aio_compr_ops;
 
 int uniphier_aio_dai_probe(struct snd_soc_dai *dai);
 int uniphier_aio_dai_remove(struct snd_soc_dai *dai);
-int uniphier_aio_dai_suspend(struct snd_soc_dai *dai);
-int uniphier_aio_dai_resume(struct snd_soc_dai *dai);
 int uniphier_aio_probe(struct platform_device *pdev);
 int uniphier_aio_remove(struct platform_device *pdev);
 extern const struct snd_soc_dai_ops uniphier_aio_i2s_ops;