diff options
author | Peter Ujfalusi <peter.ujfalusi@nokia.com> | 2008-12-10 05:51:47 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-10 06:43:01 -0500 |
commit | d4a73131a56e906b8f65e20934516adcad68b524 (patch) | |
tree | 4ab0c74c8867be1b5c01fa1c8fef4870f0958396 | |
parent | 6a1bee4a9cae13aa73abd8f724bada213a38eb63 (diff) |
ASoC: TWL4030: Small cleanup
The mux switch related texts fits to on line, no need to wrap
them.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/codecs/twl4030.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 13d5a12ac293..b321928152d1 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c | |||
@@ -192,8 +192,7 @@ static void twl4030_init_chip(struct snd_soc_codec *codec) | |||
192 | 192 | ||
193 | /* Earpiece */ | 193 | /* Earpiece */ |
194 | static const char *twl4030_earpiece_texts[] = | 194 | static const char *twl4030_earpiece_texts[] = |
195 | {"Off", "DACL1", "DACL2", "Invalid", | 195 | {"Off", "DACL1", "DACL2", "Invalid", "DACR1"}; |
196 | "DACR1"}; | ||
197 | 196 | ||
198 | static const struct soc_enum twl4030_earpiece_enum = | 197 | static const struct soc_enum twl4030_earpiece_enum = |
199 | SOC_ENUM_SINGLE(TWL4030_REG_EAR_CTL, 1, | 198 | SOC_ENUM_SINGLE(TWL4030_REG_EAR_CTL, 1, |
@@ -205,8 +204,7 @@ SOC_DAPM_ENUM("Route", twl4030_earpiece_enum); | |||
205 | 204 | ||
206 | /* PreDrive Left */ | 205 | /* PreDrive Left */ |
207 | static const char *twl4030_predrivel_texts[] = | 206 | static const char *twl4030_predrivel_texts[] = |
208 | {"Off", "DACL1", "DACL2", "Invalid", | 207 | {"Off", "DACL1", "DACL2", "Invalid", "DACR2"}; |
209 | "DACR2"}; | ||
210 | 208 | ||
211 | static const struct soc_enum twl4030_predrivel_enum = | 209 | static const struct soc_enum twl4030_predrivel_enum = |
212 | SOC_ENUM_SINGLE(TWL4030_REG_PREDL_CTL, 1, | 210 | SOC_ENUM_SINGLE(TWL4030_REG_PREDL_CTL, 1, |
@@ -218,8 +216,7 @@ SOC_DAPM_ENUM("Route", twl4030_predrivel_enum); | |||
218 | 216 | ||
219 | /* PreDrive Right */ | 217 | /* PreDrive Right */ |
220 | static const char *twl4030_predriver_texts[] = | 218 | static const char *twl4030_predriver_texts[] = |
221 | {"Off", "DACR1", "DACR2", "Invalid", | 219 | {"Off", "DACR1", "DACR2", "Invalid", "DACL2"}; |
222 | "DACL2"}; | ||
223 | 220 | ||
224 | static const struct soc_enum twl4030_predriver_enum = | 221 | static const struct soc_enum twl4030_predriver_enum = |
225 | SOC_ENUM_SINGLE(TWL4030_REG_PREDR_CTL, 1, | 222 | SOC_ENUM_SINGLE(TWL4030_REG_PREDR_CTL, 1, |