ASoC: McASP: calculate values for channel size

Change davinci_config_channel_size() to derive the values for XSSZ and
XROT in DAVINCI_MCASP_[RT]XFMT_REG from the configured word length
rather than hard-coding them in a switch/case block.

Also, by directly passing the word length to
davinci_config_channel_size(), we can get rid of the
DAVINCI_AUDIO_WORD_* enum.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 0 insertions, 10 deletions

diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/davinci/davinci-mcasp.h
index a42b5d96739f..d2449a865fc2 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
@@ -27,16 +27,6 @@
 #define DAVINCI_MCASP_I2S_DAI   0
 #define DAVINCI_MCASP_DIT_DAI   1
 
-enum {
-        DAVINCI_AUDIO_WORD_8 = 0,
-        DAVINCI_AUDIO_WORD_12,
-        DAVINCI_AUDIO_WORD_16,
-        DAVINCI_AUDIO_WORD_20,
-        DAVINCI_AUDIO_WORD_24,
-        DAVINCI_AUDIO_WORD_32,
-        DAVINCI_AUDIO_WORD_28,  /* This is only valid for McASP */
-};
-
 struct davinci_audio_dev {
         struct davinci_pcm_dma_params dma_params[2];
         void __iomem *base;