ASoC: remove duplicated code on pxa-ssp.c
Subsystems (3)
PATCH 1/1 ASoC: remove duplicated code on pxa-ssp.c
* We don't need to write the registers twice, remove the first write.
* DAIFMT_INV switch is duplicated inside DAIFMT_FORMAT switch, move it out.
(This patch is for Mark's for-2.6.32 branch, I have not checked if the code is duplicated on current 2.6.30)
Signed-off-by Daniel Ribeiro <[email protected]>
--- sound/soc/pxa/pxa-ssp.c | 50 ++++++++++++++-------------------------------- 1 files changed, 15 insertions(+), 35 deletions(-)
sound/soc/pxa/pxa-ssp.c +15 -35
@@ -457,31 +457,27 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai,return -EINVAL ; } -ssp_write_reg (ssp,SSCR0 , sscr0); -ssp_write_reg (ssp,SSCR1 , sscr1); -ssp_write_reg (ssp,SSPSP , sspsp); +switch (fmt &SND_SOC_DAIFMT_INV_MASK ) { +case SND_SOC_DAIFMT_NB_NF : + sspsp |=SSPSP_SFRMP ; +break ; +case SND_SOC_DAIFMT_NB_IF : +break ; +case SND_SOC_DAIFMT_IB_IF : + sspsp |=SSPSP_SCMODE (2 ); +break ; +case SND_SOC_DAIFMT_IB_NF : + sspsp |=SSPSP_SCMODE (2 ) |SSPSP_SFRMP ; +break ; +default : +return -EINVAL ; + }switch (fmt &SND_SOC_DAIFMT_FORMAT_MASK ) {case SND_SOC_DAIFMT_I2S : sscr0 |=SSCR0_PSP ; sscr1 |=SSCR1_RWOT |SSCR1_TRAIL ; -/* See hw_params() */ -switch (fmt &SND_SOC_DAIFMT_INV_MASK ) { -case SND_SOC_DAIFMT_NB_NF : - sspsp |=SSPSP_SFRMP ; -break ; -case SND_SOC_DAIFMT_NB_IF : -break ; -case SND_SOC_DAIFMT_IB_IF : - sspsp |=SSPSP_SCMODE (2 ); -break ; -case SND_SOC_DAIFMT_IB_NF : - sspsp |=SSPSP_SCMODE (2 ) |SSPSP_SFRMP ; -break ; -default : -return -EINVAL ; - }break ;case SND_SOC_DAIFMT_DSP_A :
@@ -489,22 +485,6 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai,case SND_SOC_DAIFMT_DSP_B : sscr0 |=SSCR0_MOD |SSCR0_PSP ; sscr1 |=SSCR1_TRAIL |SSCR1_RWOT ; - -switch (fmt &SND_SOC_DAIFMT_INV_MASK ) { -case SND_SOC_DAIFMT_NB_NF : - sspsp |=SSPSP_SFRMP ; -break ; -case SND_SOC_DAIFMT_NB_IF : -break ; -case SND_SOC_DAIFMT_IB_IF : - sspsp |=SSPSP_SCMODE (2 ); -break ; -case SND_SOC_DAIFMT_IB_NF : - sspsp |=SSPSP_SCMODE (2 ) |SSPSP_SFRMP ; -break ; -default : -return -EINVAL ; - }break ;default :
Signature · 4 lines
tg: (a3ba169..) asoc/remove-code-duplication (depends on: asoc/upstream-for-2.6.32) -- Daniel Ribeiro
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Mark Brown
AppliedQuoted 8 lines · Daniel Ribeiro
* We don't need to write the registers twice, remove the first write.
*DAIFMT_INVswitch is duplicated insideDAIFMT_FORMATswitch, move it out.(This patch is for Mark's for-2.6.32 branch, I have not checked if the code is duplicated on current 2.6.30)
Signed-off-by Daniel Ribeiro <[email protected]>
Applied, thanks.