aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/sn95031.c
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2011-01-07 05:50:28 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-01-10 06:35:41 -0500
commitb22dab8883250d5fd91c8c4a7bd00c5985ac82ad (patch)
treee660614539b5e5361e4f3eb9b0c9871dd78c2158 /sound/soc/codecs/sn95031.c
parente62255f2adf2e6407d9ac72f5d5ec17712a4fc1d (diff)
ASoC: sn95031 fix the code style and format inconsistencies
this patch fixes inconsistencies commented by Mark. This also fixes few other style things in audio_map & header file Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Harsha Priya <priya.harsha@intel.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/sn95031.c')
-rw-r--r--sound/soc/codecs/sn95031.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
index 146b74467ae7..593632cf791d 100644
--- a/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
@@ -235,21 +235,21 @@ static const struct snd_soc_dapm_route sn95031_audio_map[] = {
235 { "IHFDAC Right", NULL, "Speaker Rail"}, 235 { "IHFDAC Right", NULL, "Speaker Rail"},
236 236
237 /* vibra map */ 237 /* vibra map */
238 {"VIB1OUT", NULL, "Vibra1 Playback"}, 238 { "VIB1OUT", NULL, "Vibra1 Playback"},
239 {"Vibra1 Playback", NULL, "Vibra1 DAC"}, 239 { "Vibra1 Playback", NULL, "Vibra1 DAC"},
240 240
241 {"VIB2OUT", NULL, "Vibra2 Playback"}, 241 { "VIB2OUT", NULL, "Vibra2 Playback"},
242 {"Vibra2 Playback", NULL, "Vibra2 DAC"}, 242 { "Vibra2 Playback", NULL, "Vibra2 DAC"},
243 243
244 /* lineout */ 244 /* lineout */
245 {"LINEOUTL", NULL, "Lineout Left Playback"}, 245 { "LINEOUTL", NULL, "Lineout Left Playback"},
246 {"LINEOUTR", NULL, "Lineout Right Playback"}, 246 { "LINEOUTR", NULL, "Lineout Right Playback"},
247 {"Lineout Left Playback", NULL, "Headset Left Filter"}, 247 { "Lineout Left Playback", NULL, "Headset Left Filter"},
248 {"Lineout Left Playback", NULL, "Speaker Left Filter"}, 248 { "Lineout Left Playback", NULL, "Speaker Left Filter"},
249 {"Lineout Left Playback", NULL, "Vibra1 DAC"}, 249 { "Lineout Left Playback", NULL, "Vibra1 DAC"},
250 {"Lineout Right Playback", NULL, "Headset Right Filter"}, 250 { "Lineout Right Playback", NULL, "Headset Right Filter"},
251 {"Lineout Right Playback", NULL, "Speaker Right Filter"}, 251 { "Lineout Right Playback", NULL, "Speaker Right Filter"},
252 {"Lineout Right Playback", NULL, "Vibra2 DAC"}, 252 { "Lineout Right Playback", NULL, "Vibra2 DAC"},
253}; 253};
254 254
255/* speaker and headset mutes, for audio pops and clicks */ 255/* speaker and headset mutes, for audio pops and clicks */
@@ -444,8 +444,8 @@ static int sn95031_codec_remove(struct snd_soc_codec *codec)
444} 444}
445 445
446struct snd_soc_codec_driver sn95031_codec = { 446struct snd_soc_codec_driver sn95031_codec = {
447 .probe = sn95031_codec_probe, 447 .probe = sn95031_codec_probe,
448 .remove = sn95031_codec_remove, 448 .remove = sn95031_codec_remove,
449 .read = sn95031_read, 449 .read = sn95031_read,
450 .write = sn95031_write, 450 .write = sn95031_write,
451 .set_bias_level = sn95031_set_vaud_bias, 451 .set_bias_level = sn95031_set_vaud_bias,
@@ -488,7 +488,7 @@ static void __exit sn95031_exit(void)
488} 488}
489module_exit(sn95031_exit); 489module_exit(sn95031_exit);
490 490
491MODULE_DESCRIPTION("ASoC Intel(R) SN95031 codec driver"); 491MODULE_DESCRIPTION("ASoC TI SN95031 codec driver");
492MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>"); 492MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>");
493MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>"); 493MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>");
494MODULE_LICENSE("GPL v2"); 494MODULE_LICENSE("GPL v2");