ASoC: tlv320aic32x4: Move aosr and dosr setting to separate functions

Move these to separate helper functions.  This looks cleaner and fits
better with the new clock setting in CCF.

Signed-off-by: Annaliese McDermond <nh6z@nh6z.net>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index c3e9f65b26a765e297af66f6365bcae551e2b897..bf3a80237b036ee5b85b61f4e3bd1b5102efa6d3 100644 (file)
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -718,6 +718,20 @@ static int aic32x4_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
        return 0;
 }
 
+static int aic32x4_set_aosr(struct snd_soc_component *component, u8 aosr)
+{
+       return snd_soc_component_write(component, AIC32X4_AOSR, aosr);
+}
+
+static int aic32x4_set_dosr(struct snd_soc_component *component, u16 dosr)
+{
+       snd_soc_component_write(component, AIC32X4_DOSRMSB, dosr >> 8);
+       snd_soc_component_write(component, AIC32X4_DOSRLSB,
+                     (dosr & 0xff));
+
+       return 0;
+}
+
 static int aic32x4_set_processing_blocks(struct snd_soc_component *component,
                                                u8 r_block, u8 p_block)
 {
@@ -763,14 +777,10 @@ static int aic32x4_setup_clocks(struct snd_soc_component *component,
        clk_set_rate(clocks[4].clk, aic32x4_divs[i].mdac_rate);
        clk_set_rate(clocks[5].clk, aic32x4_divs[i].bdiv_rate);
 
-       aic32x4_set_processing_blocks(component, aic32x4_divs[i].r_block, aic32x4_divs[i].p_block);
+       aic32x4_set_aosr(component, aic32x4_divs[i].aosr);
+       aic32x4_set_dosr(component, aic32x4_divs[i].dosr);
 
-       /* DOSR MSB & LSB values */
-       snd_soc_component_write(component, AIC32X4_DOSRMSB, aic32x4_divs[i].dosr >> 8);
-       snd_soc_component_write(component, AIC32X4_DOSRLSB, (aic32x4_divs[i].dosr & 0xff));
-
-       /* AOSR value */
-       snd_soc_component_write(component, AIC32X4_AOSR, aic32x4_divs[i].aosr);
+       aic32x4_set_processing_blocks(component, aic32x4_divs[i].r_block, aic32x4_divs[i].p_block);
 
        return 0;
 }