ASoC: jz4740: jz4740-i2s: 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/878sm3ym4j.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index 38d48d10178374a7dce8b4482f29bb21c10e1cd9..9d540588120918b70cff08b31ae5100b29783bb0 100644 (file)
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -324,12 +324,12 @@ static int jz4740_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id,
        return ret;
 }
 
-static int jz4740_i2s_suspend(struct snd_soc_dai *dai)
+static int jz4740_i2s_suspend(struct snd_soc_component *component)
 {
-       struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai);
+       struct jz4740_i2s *i2s = snd_soc_component_get_drvdata(component);
        uint32_t conf;
 
-       if (dai->active) {
+       if (component->active) {
                conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF);
                conf &= ~JZ_AIC_CONF_ENABLE;
                jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf);
@@ -342,9 +342,9 @@ static int jz4740_i2s_suspend(struct snd_soc_dai *dai)
        return 0;
 }
 
-static int jz4740_i2s_resume(struct snd_soc_dai *dai)
+static int jz4740_i2s_resume(struct snd_soc_component *component)
 {
-       struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai);
+       struct jz4740_i2s *i2s = snd_soc_component_get_drvdata(component);
        uint32_t conf;
        int ret;
 
@@ -352,7 +352,7 @@ static int jz4740_i2s_resume(struct snd_soc_dai *dai)
        if (ret)
                return ret;
 
-       if (dai->active) {
+       if (component->active) {
                ret = clk_prepare_enable(i2s->clk_i2s);
                if (ret) {
                        clk_disable_unprepare(i2s->clk_aic);
@@ -455,8 +455,6 @@ static struct snd_soc_dai_driver jz4740_i2s_dai = {
        },
        .symmetric_rates = 1,
        .ops = &jz4740_i2s_dai_ops,
-       .suspend = jz4740_i2s_suspend,
-       .resume = jz4740_i2s_resume,
 };
 
 static struct snd_soc_dai_driver jz4780_i2s_dai = {
@@ -475,12 +473,12 @@ static struct snd_soc_dai_driver jz4780_i2s_dai = {
                .formats = JZ4740_I2S_FMTS,
        },
        .ops = &jz4740_i2s_dai_ops,
-       .suspend = jz4740_i2s_suspend,
-       .resume = jz4740_i2s_resume,
 };
 
 static const struct snd_soc_component_driver jz4740_i2s_component = {
        .name           = "jz4740-i2s",
+       .suspend        = jz4740_i2s_suspend,
+       .resume         = jz4740_i2s_resume,
 };
 
 #ifdef CONFIG_OF