[ALSA] Remove trailing whitespaces from soc/* files

Remove trailing whitespaces from soc/* files added by the
conversion to C99-style initialization.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

diff --git a/sound/soc/at91/at91rm9200-i2s.c b/sound/soc/at91/at91rm9200-i2s.c
index 91f1daa44f19c5db984420c24a82c6b37e0a3c69..8c4d3b9990531639c4a899172ff74018d66fc37e 100644 (file)
--- a/sound/soc/at91/at91rm9200-i2s.c
+++ b/sound/soc/at91/at91rm9200-i2s.c
@@ -52,9 +52,9 @@ static struct snd_soc_dai_mode at91rm9200_i2s[] = {
 
        /* 8k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */
        {
-               .fmt = AT91RM9200_I2S_DAIFMT, 
-               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 
-               .pcmrate = SNDRV_PCM_RATE_8000, 
+               .fmt = AT91RM9200_I2S_DAIFMT,
+               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
+               .pcmrate = SNDRV_PCM_RATE_8000,
                .pcmdir = AT91RM9200_I2S_DIR,
                .flags = SND_SOC_DAI_BFS_DIV,
                .fs = 1500,
@@ -63,38 +63,38 @@ static struct snd_soc_dai_mode at91rm9200_i2s[] = {
        },
 
        /* 16k: BCLK = (MCLK/3) ~= (60MHz/14) = 4.285714MHz */
-       { 
+       {
                .fmt = AT91RM9200_I2S_DAIFMT,
                .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
                .pcmrate = SNDRV_PCM_RATE_16000,
                .pcmdir = AT91RM9200_I2S_DIR,
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 750, 
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 750,
                .bfs = SND_SOC_FSBD(3),
                .flags (7 << 16 | 133),
        },
 
        /* 24k: BCLK = (MCLK/10) = (60MHz/50) = 1.2MHz */
-       { 
+       {
                .fmt = AT91RM9200_I2S_DAIFMT,
-               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 
-               .pcmrate = SNDRV_PCM_RATE_22050, 
+               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
+               .pcmrate = SNDRV_PCM_RATE_22050,
                .pcmdir = AT91RM9200_I2S_DIR,
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 500, 
-               .bfs = SND_SOC_FSBD(10), 
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 500,
+               .bfs = SND_SOC_FSBD(10),
                .priv = (25 << 16 | 24),
        },
 
        /* 48kHz: BCLK = (MCLK/5) ~= (60MHz/26) = 2.3076923MHz */
-       { 
+       {
                .fmt = AT91RM9200_I2S_DAIFMT,
                .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
-               .pcmrate = SNDRV_PCM_RATE_48000, 
+               .pcmrate = SNDRV_PCM_RATE_48000,
                .pcmdir = AT91RM9200_I2S_DIR,
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 250, 
-               .bfs SND_SOC_FSBD(5), 
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 250,
+               .bfs SND_SOC_FSBD(5),
                .priv = (13 << 16 | 23),
        },
 };

diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 03a6bb9b8773c6c511af90481f27c3d2d45dfe7b..9adbd2d401c4e9834932a6804c4c279c6cc7d033 100644 (file)
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -87,89 +87,89 @@ static struct snd_soc_dai_mode wm8731_modes[] = {
        /* 8k */
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8731_HIFI_BITS, 
-               .pcmrate = SNDRV_PCM_RATE_8000, 
+               .pcmfmt = WM8731_HIFI_BITS,
+               .pcmrate = SNDRV_PCM_RATE_8000,
                .pcmdir = WM8731_DIR,
-               .fs = 1536, 
+               .fs = 1536,
                .bfs = SND_SOC_FSB(64),
        },
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8731_HIFI_BITS, 
-               .pcmrate = SNDRV_PCM_RATE_8000, 
+               .pcmfmt = WM8731_HIFI_BITS,
+               .pcmrate = SNDRV_PCM_RATE_8000,
                .pcmdir = WM8731_DIR,
-               .fs = 2304, 
+               .fs = 2304,
                .bfs = SND_SOC_FSB(64),
        },
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8731_HIFI_BITS, 
-               .pcmrate = SNDRV_PCM_RATE_8000, 
+               .pcmfmt = WM8731_HIFI_BITS,
+               .pcmrate = SNDRV_PCM_RATE_8000,
                .pcmdir = WM8731_DIR,
-               .fs = 1408, 
+               .fs = 1408,
                .bfs = SND_SOC_FSB(64),
        },
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8731_HIFI_BITS, 
-               .pcmrate = SNDRV_PCM_RATE_8000, 
+               .pcmfmt = WM8731_HIFI_BITS,
+               .pcmrate = SNDRV_PCM_RATE_8000,
                .pcmdir = WM8731_DIR,
-               .fs = 2112, 
+               .fs = 2112,
                .bfs = SND_SOC_FSB(64),
        },
 
        /* 32k */
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8731_HIFI_BITS, 
+               .pcmfmt = WM8731_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_32000,
                .pcmdir = WM8731_DIR,
-               .fs = 384, 
+               .fs = 384,
                .bfs = SND_SOC_FSB(64),
        },
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8731_HIFI_BITS, 
-               .pcmrate = SNDRV_PCM_RATE_32000, 
+               .pcmfmt = WM8731_HIFI_BITS,
+               .pcmrate = SNDRV_PCM_RATE_32000,
                .pcmdir = WM8731_DIR,
-               .fs = 576, 
+               .fs = 576,
                .bfs = SND_SOC_FSB(64),
        },
 
        /* 44.1k & 48k */
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8731_HIFI_BITS, 
+               .pcmfmt = WM8731_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
                .pcmdir = WM8731_DIR,
-               .fs = 256, 
+               .fs = 256,
                .bfs = SND_SOC_FSB(64),
        },
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8731_HIFI_BITS, 
+               .pcmfmt = WM8731_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
                .pcmdir = WM8731_DIR,
-               .fs = 384, 
+               .fs = 384,
                .bfs = SND_SOC_FSB(64),
        },
 
        /* 88.2 & 96k */
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8731_HIFI_BITS, 
+               .pcmfmt = WM8731_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
                .pcmdir = WM8731_DIR,
-               .fs = 128, 
+               .fs = 128,
                .bfs = SND_SOC_FSB(64),
                
        },
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8731_HIFI_BITS, 
+               .pcmfmt = WM8731_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
                .pcmdir = WM8731_DIR,
-               .fs = 192, 
+               .fs = 192,
                .bfs = SND_SOC_FSB(64),
        },
 
@@ -177,66 +177,66 @@ static struct snd_soc_dai_mode wm8731_modes[] = {
        /* 8k */
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8731_HIFI_BITS, 
-               .pcmrate = SNDRV_PCM_RATE_8000, 
+               .pcmfmt = WM8731_HIFI_BITS,
+               .pcmrate = SNDRV_PCM_RATE_8000,
                .pcmdir = WM8731_DIR,
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 1500, 
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 1500,
                .bfs = SND_SOC_FSBD(1),
        },
 
        /* 44.1k */
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8731_HIFI_BITS, 
-               .pcmrate = SNDRV_PCM_RATE_44100, 
+               .pcmfmt = WM8731_HIFI_BITS,
+               .pcmrate = SNDRV_PCM_RATE_44100,
                .pcmdir = WM8731_DIR,
                .flags = SND_SOC_DAI_BFS_DIV,
-               .fs = 272, 
+               .fs = 272,
                .bfs = SND_SOC_FSBD(1),
        },
 
        /* 48k */
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8731_HIFI_BITS, 
-               .pcmrate = SNDRV_PCM_RATE_48000, 
+               .pcmfmt = WM8731_HIFI_BITS,
+               .pcmrate = SNDRV_PCM_RATE_48000,
                .pcmdir = WM8731_DIR,
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 250, 
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 250,
                .bfs = SND_SOC_FSBD(1),
        },
 
        /* 88.2k */
        {
-               .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM, 
-               .pcmfmt = WM8731_HIFI_BITS, 
-               .pcmrate = SNDRV_PCM_RATE_88200, 
+               .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
+               .pcmfmt = WM8731_HIFI_BITS,
+               .pcmrate = SNDRV_PCM_RATE_88200,
                .pcmdir = WM8731_DIR,
                .flags = SND_SOC_DAI_BFS_DIV,
-               .fs = 136, 
+               .fs = 136,
                .bfs = SND_SOC_FSBD(1),
        },
 
        /* 96k */
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8731_HIFI_BITS, 
-               .pcmrate = SNDRV_PCM_RATE_96000, 
+               .pcmfmt = WM8731_HIFI_BITS,
+               .pcmrate = SNDRV_PCM_RATE_96000,
                .pcmdir = WM8731_DIR,
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 125, 
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 125,
                .bfs = SND_SOC_FSBD(1),
        },
 
        /* codec frame and clock slave modes */
        {
                .fmt = WM8731_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
-               .pcmfmt = WM8731_HIFI_BITS, 
-               .pcmrate = WM8731_RATES, 
+               .pcmfmt = WM8731_HIFI_BITS,
+               .pcmrate = WM8731_RATES,
                .pcmdir = WM8731_DIR,
                .flags = SND_SOC_DAI_BFS_DIV,
-               .fs = SND_SOC_FS_ALL, 
+               .fs = SND_SOC_FS_ALL,
                .bfs = SND_SOC_FSBD_ALL,
        },
 };

diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c
index b07a6ed6aa66db1fa4c007a98f2173bd7f0b5570..243da712d9c14b53b0c4c17c043c9f8903c43f77 100644 (file)
--- a/sound/soc/codecs/wm8750.c
+++ b/sound/soc/codecs/wm8750.c
@@ -99,250 +99,250 @@ static struct snd_soc_dai_mode wm8750_modes[] = {
        /* 8k */
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_8000,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 1536, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 1536,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_8000,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 1408, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 1408,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_8000,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 2304, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 2304,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_8000,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 2112, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 2112,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_8000,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 1500, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 1500,
                .bfs = WM8750_HIFI_FSB,
        },
 
        /* 11.025k */
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_11025,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 1024, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 1024,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_11025,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 1536, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 1536,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_11025,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 1088, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 1088,
                .bfs = WM8750_HIFI_FSB,
        },
 
        /* 16k */
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_16000,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 768, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 768,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_16000,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 1152, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 1152,
                .bfs = WM8750_HIFI_FSB
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_16000,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 750, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 750,
                .bfs = WM8750_HIFI_FSB,
        },
 
        /* 22.05k */
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_22050,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 512, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 512,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_22050,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 768, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 768,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_22050,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 544, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 544,
                .bfs = WM8750_HIFI_FSB,
        },
 
        /* 32k */
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_32000,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 384, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 384,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_32000,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 576, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 576,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_32000,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 375, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 375,
                .bfs = WM8750_HIFI_FSB,
        },
 
        /* 44.1k & 48k */
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
-               .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, 
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
+               .pcmfmt = WM8750_HIFI_BITS,
+               .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
                .fs = 256,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
-               .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000, 
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
+               .pcmfmt = WM8750_HIFI_BITS,
+               .pcmrate = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000,
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
                .fs = 384,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_44100,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 272, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 272,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_48000,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 250, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 250,
                .bfs = WM8750_HIFI_FSB,
        },
 
        /* 88.2k & 96k */
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
-               .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000, 
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
+               .pcmfmt = WM8750_HIFI_BITS,
+               .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
                .fs = 128,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
-               .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000, 
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
+               .pcmfmt = WM8750_HIFI_BITS,
+               .pcmrate = SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000,
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
                .fs = 192,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_88200,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 136, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 136,
                .bfs = WM8750_HIFI_FSB,
        },
        {
                .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBM_CFM,
-               .pcmfmt = WM8750_HIFI_BITS, 
+               .pcmfmt = WM8750_HIFI_BITS,
                .pcmrate = SNDRV_PCM_RATE_96000,
-               .pcmdir = WM8750_DIR, 
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 125, 
+               .pcmdir = WM8750_DIR,
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 125,
                .bfs = WM8750_HIFI_FSB,
        },
 
        /* codec frame and clock slave modes */
        {
-               .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBS_CFS, 
-               .pcmfmt = WM8750_HIFI_BITS, 
-               .pcmrate = WM8750_HIFI_RATES, 
+               .fmt = WM8750_HIFI_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
+               .pcmfmt = WM8750_HIFI_BITS,
+               .pcmrate = WM8750_HIFI_RATES,
                .pcmdir = WM8750_DIR,
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = SND_SOC_FS_ALL, 
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = SND_SOC_FS_ALL,
                .bfs = SND_SOC_FSBD_ALL,
        },
 };

diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index db2310f87fbe944b6b4cfcfb3e6e0b64184cd7a6..99f1da32744bb61cc330746388ed191385b98568 100644 (file)
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -60,61 +60,61 @@ static struct snd_soc_dai_mode pxa2xx_i2s_modes[] = {
        /* pxa2xx I2S frame and clock master modes */
        {
                .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
-               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 
-               .pcmrate = SNDRV_PCM_RATE_8000, 
+               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
+               .pcmrate = SNDRV_PCM_RATE_8000,
                .pcmdir = PXA_I2S_DIR,
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 256, 
-               .bfs = SND_SOC_FSBD(4), 
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 256,
+               .bfs = SND_SOC_FSBD(4),
                .priv = 0x48,
        },
        {
                .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
-               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 
-               .pcmrate = SNDRV_PCM_RATE_11025, 
+               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
+               .pcmrate = SNDRV_PCM_RATE_11025,
                .pcmdir = PXA_I2S_DIR,
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 256, 
-               .bfs = SND_SOC_FSBD(4), 
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 256,
+               .bfs = SND_SOC_FSBD(4),
                .priv = 0x34,
        },
        {
                .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
-               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 
-               .pcmrate = SNDRV_PCM_RATE_16000, 
+               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
+               .pcmrate = SNDRV_PCM_RATE_16000,
                .pcmdir = PXA_I2S_DIR,
                .flags = SND_SOC_DAI_BFS_DIV,
-               .fs = 256, 
-               .bfs = SND_SOC_FSBD(4), 
+               .fs = 256,
+               .bfs = SND_SOC_FSBD(4),
                .priv = 0x24,
        },
        {
                .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
-               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 
+               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
                .pcmrate = SNDRV_PCM_RATE_22050,
                .pcmdir = PXA_I2S_DIR,
                .flags = SND_SOC_DAI_BFS_DIV,
-               .fs = 256, 
-               .bfs = SND_SOC_FSBD(4), 
+               .fs = 256,
+               .bfs = SND_SOC_FSBD(4),
                .priv = 0x1a,
        },
        {
                .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
-               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 
-               .pcmrate = SNDRV_PCM_RATE_44100, 
+               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
+               .pcmrate = SNDRV_PCM_RATE_44100,
                .pcmdir = PXA_I2S_DIR,
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 256, 
-               .bfs = SND_SOC_FSBD(4), 
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 256,
+               .bfs = SND_SOC_FSBD(4),
                .priv = 0xd,
        },
        {
                .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBS_CFS,
-               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 
-               .pcmrate = SNDRV_PCM_RATE_48000, 
+               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
+               .pcmrate = SNDRV_PCM_RATE_48000,
                .pcmdir = PXA_I2S_DIR,
-               .flags = SND_SOC_DAI_BFS_DIV, 
-               .fs = 256, 
+               .flags = SND_SOC_DAI_BFS_DIV,
+               .fs = 256,
                .bfs = SND_SOC_FSBD(4),
                .priv = 0xc,
        },
@@ -122,11 +122,11 @@ static struct snd_soc_dai_mode pxa2xx_i2s_modes[] = {
        /* pxa2xx I2S frame master and clock slave mode */
        {
                .fmt = PXA_I2S_DAIFMT | SND_SOC_DAIFMT_CBM_CFS,
-               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE, 
+               .pcmfmt = SNDRV_PCM_FMTBIT_S16_LE,
                .pcmrate = PXA_I2S_RATES,
                .pcmdir = PXA_I2S_DIR,
-               .fs = SND_SOC_FS_ALL, 
-               .bfs = SND_SOC_FSB(64), 
+               .fs = SND_SOC_FS_ALL,
+               .bfs = SND_SOC_FSB(64),
                .priv = 0x48,
        },
 };