Hi Aidan,
Le ven., juil. 8 2022 at 17:02:43 +0100, Aidan MacDonald aidanmacdonald.0x0@gmail.com a écrit :
Move the component suspend/resume functions near the definition of the component driver to emphasize that they're unrelated to the DAI functions.
Signed-off-by: Aidan MacDonald aidanmacdonald.0x0@gmail.com
I'm not really fond of moving code like that, so I'll leave Mark with the liberty to take or not this patch.
Acked-by: Paul Cercueil paul@crapouillou.net
Cheers, -Paul
sound/soc/jz4740/jz4740-i2s.c | 72 +++++++++++++++++------------------ 1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index 70b9d28a40ce..5db73f12efcf 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c @@ -303,42 +303,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); @@ -459,6 +423,42 @@ static const struct i2s_soc_info jz4780_i2s_soc_info = { .pll_clk_name = "pll half", };
+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, -- 2.35.1