[alsa-devel] [PATCH 1/3] ASoC: sn95031 fix the code style and format inconsistencies

Koul, Vinod vinod.koul at intel.com
Fri Jan 7 11:50:28 CET 2011


From: Vinod Koul <vinod.koul at intel.com>

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 at intel.com>
Signed-off-by: Harsha Priya <priya.harsha at intel.com>
---
 sound/soc/codecs/sn95031.c |   30 +++++++++++++++---------------
 sound/soc/codecs/sn95031.h |   12 ++++++------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
index 146b744..593632c 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[] = {
 	{ "IHFDAC Right", NULL, "Speaker Rail"},
 
 	/* vibra map */
-	{"VIB1OUT", NULL, "Vibra1 Playback"},
-	{"Vibra1 Playback", NULL, "Vibra1 DAC"},
+	{ "VIB1OUT", NULL, "Vibra1 Playback"},
+	{ "Vibra1 Playback", NULL, "Vibra1 DAC"},
 
-	{"VIB2OUT", NULL, "Vibra2 Playback"},
-	{"Vibra2 Playback", NULL, "Vibra2 DAC"},
+	{ "VIB2OUT", NULL, "Vibra2 Playback"},
+	{ "Vibra2 Playback", NULL, "Vibra2 DAC"},
 
 	/* lineout */
-	{"LINEOUTL", NULL, "Lineout Left Playback"},
-	{"LINEOUTR", NULL, "Lineout Right Playback"},
-	{"Lineout Left Playback", NULL, "Headset Left Filter"},
-	{"Lineout Left Playback", NULL, "Speaker Left Filter"},
-	{"Lineout Left Playback", NULL, "Vibra1 DAC"},
-	{"Lineout Right Playback", NULL, "Headset Right Filter"},
-	{"Lineout Right Playback", NULL, "Speaker Right Filter"},
-	{"Lineout Right Playback", NULL, "Vibra2 DAC"},
+	{ "LINEOUTL", NULL, "Lineout Left Playback"},
+	{ "LINEOUTR", NULL, "Lineout Right Playback"},
+	{ "Lineout Left Playback", NULL, "Headset Left Filter"},
+	{ "Lineout Left Playback", NULL, "Speaker Left Filter"},
+	{ "Lineout Left Playback", NULL, "Vibra1 DAC"},
+	{ "Lineout Right Playback", NULL, "Headset Right Filter"},
+	{ "Lineout Right Playback", NULL, "Speaker Right Filter"},
+	{ "Lineout Right Playback", NULL, "Vibra2 DAC"},
 };
 
 /* speaker and headset mutes, for audio pops and clicks */
@@ -444,8 +444,8 @@ static int sn95031_codec_remove(struct snd_soc_codec *codec)
 }
 
 struct snd_soc_codec_driver sn95031_codec = {
-	.probe =	sn95031_codec_probe,
-	.remove =	sn95031_codec_remove,
+	.probe		= sn95031_codec_probe,
+	.remove		= sn95031_codec_remove,
 	.read		= sn95031_read,
 	.write		= sn95031_write,
 	.set_bias_level	= sn95031_set_vaud_bias,
@@ -488,7 +488,7 @@ static void __exit sn95031_exit(void)
 }
 module_exit(sn95031_exit);
 
-MODULE_DESCRIPTION("ASoC Intel(R) SN95031 codec driver");
+MODULE_DESCRIPTION("ASoC TI SN95031 codec driver");
 MODULE_AUTHOR("Vinod Koul <vinod.koul at intel.com>");
 MODULE_AUTHOR("Harsha Priya <priya.harsha at intel.com>");
 MODULE_LICENSE("GPL v2");
diff --git a/sound/soc/codecs/sn95031.h b/sound/soc/codecs/sn95031.h
index b17a39b..e2b17d9 100644
--- a/sound/soc/codecs/sn95031.h
+++ b/sound/soc/codecs/sn95031.h
@@ -35,13 +35,13 @@
 #define SN95031_AUDPLLCTRL		0x240
 #define SN95031_DMICBUF0123		0x241
 #define SN95031_DMICBUF45		0x242
-#define SN95031_DMICGPO		0x244
-#define SN95031_DMICMUX		0x245
+#define SN95031_DMICGPO			0x244
+#define SN95031_DMICMUX			0x245
 #define SN95031_DMICLK			0x246
-#define SN95031_MICBIAS		0x247
+#define SN95031_MICBIAS			0x247
 #define SN95031_ADCCONFIG		0x248
-#define SN95031_MICAMP1		0x249
-#define SN95031_MICAMP2		0x24A
+#define SN95031_MICAMP1			0x249
+#define SN95031_MICAMP2			0x24A
 #define SN95031_NOISEMUX		0x24B
 #define SN95031_AUDIOMUX12		0x24C
 #define SN95031_AUDIOMUX34		0x24D
@@ -49,7 +49,7 @@
 #define SN95031_AUDIOTXEN		0x24F
 #define SN95031_HSEPRXCTRL		0x250
 #define SN95031_IHFRXCTRL		0x251
-#define SN95031_HSMIXER		0x256
+#define SN95031_HSMIXER			0x256
 #define SN95031_DACCONFIG		0x257
 #define SN95031_SOFTMUTE		0x258
 #define SN95031_HSLVOLCTRL		0x259
-- 
1.7.2.3



More information about the Alsa-devel mailing list