ASoC: jz4740-i2s: Move component functions near the component driver

Move the component suspend/resume functions near the definition
of the component driver to emphasize that they're unrelated to
the DAI functions.

Acked-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
Link: https://lore.kernel.org/r/20221023143328.160866-9-aidanmacdonald.0x0@gmail.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 201368f..ac04b17 100644 (file)
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -302,42 +302,6 @@ static int jz4740_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id,
        return ret;
 }
 
-static int jz4740_i2s_suspend(struct snd_soc_component *component)
-{
-       struct jz4740_i2s *i2s = snd_soc_component_get_drvdata(component);
-
-       if (snd_soc_component_active(component)) {
-               regmap_clear_bits(i2s->regmap, JZ_REG_AIC_CONF, JZ_AIC_CONF_ENABLE);
-               clk_disable_unprepare(i2s->clk_i2s);
-       }
-
-       clk_disable_unprepare(i2s->clk_aic);
-
-       return 0;
-}
-
-static int jz4740_i2s_resume(struct snd_soc_component *component)
-{
-       struct jz4740_i2s *i2s = snd_soc_component_get_drvdata(component);
-       int ret;
-
-       ret = clk_prepare_enable(i2s->clk_aic);
-       if (ret)
-               return ret;
-
-       if (snd_soc_component_active(component)) {
-               ret = clk_prepare_enable(i2s->clk_i2s);
-               if (ret) {
-                       clk_disable_unprepare(i2s->clk_aic);
-                       return ret;
-               }
-
-               regmap_set_bits(i2s->regmap, JZ_REG_AIC_CONF, JZ_AIC_CONF_ENABLE);
-       }
-
-       return 0;
-}
-
 static int jz4740_i2s_dai_probe(struct snd_soc_dai *dai)
 {
        struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai);
@@ -454,6 +418,42 @@ static const struct i2s_soc_info jz4780_i2s_soc_info = {
        .field_i2sdiv_playback  = REG_FIELD(JZ_REG_AIC_CLK_DIV, 0, 3),
 };
 
+static int jz4740_i2s_suspend(struct snd_soc_component *component)
+{
+       struct jz4740_i2s *i2s = snd_soc_component_get_drvdata(component);
+
+       if (snd_soc_component_active(component)) {
+               regmap_clear_bits(i2s->regmap, JZ_REG_AIC_CONF, JZ_AIC_CONF_ENABLE);
+               clk_disable_unprepare(i2s->clk_i2s);
+       }
+
+       clk_disable_unprepare(i2s->clk_aic);
+
+       return 0;
+}
+
+static int jz4740_i2s_resume(struct snd_soc_component *component)
+{
+       struct jz4740_i2s *i2s = snd_soc_component_get_drvdata(component);
+       int ret;
+
+       ret = clk_prepare_enable(i2s->clk_aic);
+       if (ret)
+               return ret;
+
+       if (snd_soc_component_active(component)) {
+               ret = clk_prepare_enable(i2s->clk_i2s);
+               if (ret) {
+                       clk_disable_unprepare(i2s->clk_aic);
+                       return ret;
+               }
+
+               regmap_set_bits(i2s->regmap, JZ_REG_AIC_CONF, JZ_AIC_CONF_ENABLE);
+       }
+
+       return 0;
+}
+
 static const struct snd_soc_component_driver jz4740_i2s_component = {
        .name                   = "jz4740-i2s",
        .suspend                = jz4740_i2s_suspend,