diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-18 16:17:34 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-18 16:17:34 -0400 |
commit | 431f7771774e8f37dde5acb3f7c4c5f6fa1109e3 (patch) | |
tree | 49629544025f9e0f26d10fb805894a47ee40fcf4 | |
parent | 08aff8cd7a8568588d460c4bf8875a492d430314 (diff) |
ASoC: WM8711 minor cleanups
Coding style changes only.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/codecs/wm8711.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c index 1a7fca7d1ef9..f98c2bc32f9e 100644 --- a/sound/soc/codecs/wm8711.c +++ b/sound/soc/codecs/wm8711.c | |||
@@ -59,22 +59,6 @@ SOC_DOUBLE_R("Master Playback ZC Switch", WM8711_LOUT1V, WM8711_ROUT1V, | |||
59 | 59 | ||
60 | }; | 60 | }; |
61 | 61 | ||
62 | /* add non dapm controls */ | ||
63 | static int wm8711_add_controls(struct snd_soc_codec *codec) | ||
64 | { | ||
65 | int err, i; | ||
66 | |||
67 | for (i = 0; i < ARRAY_SIZE(wm8711_snd_controls); i++) { | ||
68 | err = snd_ctl_add(codec->card, | ||
69 | snd_soc_cnew(&wm8711_snd_controls[i], codec, | ||
70 | NULL)); | ||
71 | if (err < 0) | ||
72 | return err; | ||
73 | } | ||
74 | |||
75 | return 0; | ||
76 | } | ||
77 | |||
78 | /* Output Mixer */ | 62 | /* Output Mixer */ |
79 | static const struct snd_kcontrol_new wm8711_output_mixer_controls[] = { | 63 | static const struct snd_kcontrol_new wm8711_output_mixer_controls[] = { |
80 | SOC_DAPM_SINGLE("Line Bypass Switch", WM8711_APANA, 3, 1, 0), | 64 | SOC_DAPM_SINGLE("Line Bypass Switch", WM8711_APANA, 3, 1, 0), |
@@ -336,11 +320,7 @@ static int wm8711_set_bias_level(struct snd_soc_codec *codec, | |||
336 | return 0; | 320 | return 0; |
337 | } | 321 | } |
338 | 322 | ||
339 | #define WM8711_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\ | 323 | #define WM8711_RATES SNDRV_PCM_RATE_8000_96000 |
340 | SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\ | ||
341 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\ | ||
342 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |\ | ||
343 | SNDRV_PCM_RATE_96000) | ||
344 | 324 | ||
345 | #define WM8711_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ | 325 | #define WM8711_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ |
346 | SNDRV_PCM_FMTBIT_S24_LE) | 326 | SNDRV_PCM_FMTBIT_S24_LE) |
@@ -361,7 +341,8 @@ struct snd_soc_dai wm8711_dai = { | |||
361 | .channels_min = 1, | 341 | .channels_min = 1, |
362 | .channels_max = 2, | 342 | .channels_max = 2, |
363 | .rates = WM8711_RATES, | 343 | .rates = WM8711_RATES, |
364 | .formats = WM8711_FORMATS,}, | 344 | .formats = WM8711_FORMATS, |
345 | }, | ||
365 | .ops = &wm8711_ops, | 346 | .ops = &wm8711_ops, |
366 | }; | 347 | }; |
367 | EXPORT_SYMBOL_GPL(wm8711_dai); | 348 | EXPORT_SYMBOL_GPL(wm8711_dai); |