aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:40:58 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:40:58 -0500
commit9afa3195b96da7d2320ec44d19fbfbded7a15571 (patch)
tree15c4222de2a2b2814c9430dcb4e997b18597881c /sound
parent7c2db36e730ee4facd341679ecb21ee73ba92831 (diff)
parentdf63447f1a4402d7d9c6a9cd1c39a6d6766452d1 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "Assorted tiny fixes queued in trivial tree" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (22 commits) DocBook: update EXPORT_SYMBOL entry to point at export.h Documentation: update top level 00-INDEX file with new additions ARM: at91/ide: remove unsused at91-ide Kconfig entry percpu_counter.h: comment code for better readability x86, efi: fix comment typo in head_32.S IB: cxgb3: delay freeing mem untill entirely done with it net: mvneta: remove unneeded version.h include time: x86: report_lost_ticks doesn't exist any more pcmcia: avoid static analysis complaint about use-after-free fs/jfs: Fix typo in comment : 'how may' -> 'how many' of: add missing documentation for of_platform_populate() btrfs: remove unnecessary cur_trans set before goto loop in join_transaction sound: soc: Fix typo in sound/codecs treewide: Fix typo in various drivers btrfs: fix comment typos Update ibmvscsi module name in Kconfig. powerpc: fix typo (utilties -> utilities) of: fix spelling mistake in comment h8300: Fix home page URL in h8300/README xtensa: Fix home page URL in Kconfig ...
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/ab8500-codec.c2
-rw-r--r--sound/soc/codecs/wm8974.c6
-rw-r--r--sound/soc/codecs/wm8978.c6
-rw-r--r--sound/soc/codecs/wm8983.c6
-rw-r--r--sound/soc/codecs/wm8985.c6
5 files changed, 13 insertions, 13 deletions
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 6c12ac206ee9..a153b168129b 100644
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@ -2147,7 +2147,7 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
2147 status = ab8500_codec_set_dai_clock_gate(codec, fmt); 2147 status = ab8500_codec_set_dai_clock_gate(codec, fmt);
2148 if (status) { 2148 if (status) {
2149 dev_err(dai->codec->dev, 2149 dev_err(dai->codec->dev,
2150 "%s: ERRROR: Failed to set clock gate (%d).\n", 2150 "%s: ERROR: Failed to set clock gate (%d).\n",
2151 __func__, status); 2151 __func__, status);
2152 return status; 2152 return status;
2153 } 2153 }
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index ea58b73e86b2..b47c252ef901 100644
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -113,15 +113,15 @@ SOC_ENUM("Equaliser Function", wm8974_enum[3]),
113SOC_ENUM("EQ1 Cut Off", wm8974_enum[4]), 113SOC_ENUM("EQ1 Cut Off", wm8974_enum[4]),
114SOC_SINGLE_TLV("EQ1 Volume", WM8974_EQ1, 0, 24, 1, eq_tlv), 114SOC_SINGLE_TLV("EQ1 Volume", WM8974_EQ1, 0, 24, 1, eq_tlv),
115 115
116SOC_ENUM("Equaliser EQ2 Bandwith", wm8974_enum[5]), 116SOC_ENUM("Equaliser EQ2 Bandwidth", wm8974_enum[5]),
117SOC_ENUM("EQ2 Cut Off", wm8974_enum[6]), 117SOC_ENUM("EQ2 Cut Off", wm8974_enum[6]),
118SOC_SINGLE_TLV("EQ2 Volume", WM8974_EQ2, 0, 24, 1, eq_tlv), 118SOC_SINGLE_TLV("EQ2 Volume", WM8974_EQ2, 0, 24, 1, eq_tlv),
119 119
120SOC_ENUM("Equaliser EQ3 Bandwith", wm8974_enum[7]), 120SOC_ENUM("Equaliser EQ3 Bandwidth", wm8974_enum[7]),
121SOC_ENUM("EQ3 Cut Off", wm8974_enum[8]), 121SOC_ENUM("EQ3 Cut Off", wm8974_enum[8]),
122SOC_SINGLE_TLV("EQ3 Volume", WM8974_EQ3, 0, 24, 1, eq_tlv), 122SOC_SINGLE_TLV("EQ3 Volume", WM8974_EQ3, 0, 24, 1, eq_tlv),
123 123
124SOC_ENUM("Equaliser EQ4 Bandwith", wm8974_enum[9]), 124SOC_ENUM("Equaliser EQ4 Bandwidth", wm8974_enum[9]),
125SOC_ENUM("EQ4 Cut Off", wm8974_enum[10]), 125SOC_ENUM("EQ4 Cut Off", wm8974_enum[10]),
126SOC_SINGLE_TLV("EQ4 Volume", WM8974_EQ4, 0, 24, 1, eq_tlv), 126SOC_SINGLE_TLV("EQ4 Volume", WM8974_EQ4, 0, 24, 1, eq_tlv),
127 127
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
index f347af3a67c2..029f31c8e703 100644
--- a/sound/soc/codecs/wm8978.c
+++ b/sound/soc/codecs/wm8978.c
@@ -166,15 +166,15 @@ static const struct snd_kcontrol_new wm8978_snd_controls[] = {
166 SOC_ENUM("EQ1 Cut Off", eq1), 166 SOC_ENUM("EQ1 Cut Off", eq1),
167 SOC_SINGLE_TLV("EQ1 Volume", WM8978_EQ1, 0, 24, 1, eq_tlv), 167 SOC_SINGLE_TLV("EQ1 Volume", WM8978_EQ1, 0, 24, 1, eq_tlv),
168 168
169 SOC_ENUM("Equaliser EQ2 Bandwith", eq2bw), 169 SOC_ENUM("Equaliser EQ2 Bandwidth", eq2bw),
170 SOC_ENUM("EQ2 Cut Off", eq2), 170 SOC_ENUM("EQ2 Cut Off", eq2),
171 SOC_SINGLE_TLV("EQ2 Volume", WM8978_EQ2, 0, 24, 1, eq_tlv), 171 SOC_SINGLE_TLV("EQ2 Volume", WM8978_EQ2, 0, 24, 1, eq_tlv),
172 172
173 SOC_ENUM("Equaliser EQ3 Bandwith", eq3bw), 173 SOC_ENUM("Equaliser EQ3 Bandwidth", eq3bw),
174 SOC_ENUM("EQ3 Cut Off", eq3), 174 SOC_ENUM("EQ3 Cut Off", eq3),
175 SOC_SINGLE_TLV("EQ3 Volume", WM8978_EQ3, 0, 24, 1, eq_tlv), 175 SOC_SINGLE_TLV("EQ3 Volume", WM8978_EQ3, 0, 24, 1, eq_tlv),
176 176
177 SOC_ENUM("Equaliser EQ4 Bandwith", eq4bw), 177 SOC_ENUM("Equaliser EQ4 Bandwidth", eq4bw),
178 SOC_ENUM("EQ4 Cut Off", eq4), 178 SOC_ENUM("EQ4 Cut Off", eq4),
179 SOC_SINGLE_TLV("EQ4 Volume", WM8978_EQ4, 0, 24, 1, eq_tlv), 179 SOC_SINGLE_TLV("EQ4 Volume", WM8978_EQ4, 0, 24, 1, eq_tlv),
180 180
diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c
index c9c707b8698f..aa41ba0dfff4 100644
--- a/sound/soc/codecs/wm8983.c
+++ b/sound/soc/codecs/wm8983.c
@@ -353,13 +353,13 @@ static const struct snd_kcontrol_new wm8983_snd_controls[] = {
353 SOC_ENUM_EXT("Equalizer Function", eqmode, eqmode_get, eqmode_put), 353 SOC_ENUM_EXT("Equalizer Function", eqmode, eqmode_get, eqmode_put),
354 SOC_ENUM("EQ1 Cutoff", eq1_cutoff), 354 SOC_ENUM("EQ1 Cutoff", eq1_cutoff),
355 SOC_SINGLE_TLV("EQ1 Volume", WM8983_EQ1_LOW_SHELF, 0, 24, 1, eq_tlv), 355 SOC_SINGLE_TLV("EQ1 Volume", WM8983_EQ1_LOW_SHELF, 0, 24, 1, eq_tlv),
356 SOC_ENUM("EQ2 Bandwith", eq2_bw), 356 SOC_ENUM("EQ2 Bandwidth", eq2_bw),
357 SOC_ENUM("EQ2 Cutoff", eq2_cutoff), 357 SOC_ENUM("EQ2 Cutoff", eq2_cutoff),
358 SOC_SINGLE_TLV("EQ2 Volume", WM8983_EQ2_PEAK_1, 0, 24, 1, eq_tlv), 358 SOC_SINGLE_TLV("EQ2 Volume", WM8983_EQ2_PEAK_1, 0, 24, 1, eq_tlv),
359 SOC_ENUM("EQ3 Bandwith", eq3_bw), 359 SOC_ENUM("EQ3 Bandwidth", eq3_bw),
360 SOC_ENUM("EQ3 Cutoff", eq3_cutoff), 360 SOC_ENUM("EQ3 Cutoff", eq3_cutoff),
361 SOC_SINGLE_TLV("EQ3 Volume", WM8983_EQ3_PEAK_2, 0, 24, 1, eq_tlv), 361 SOC_SINGLE_TLV("EQ3 Volume", WM8983_EQ3_PEAK_2, 0, 24, 1, eq_tlv),
362 SOC_ENUM("EQ4 Bandwith", eq4_bw), 362 SOC_ENUM("EQ4 Bandwidth", eq4_bw),
363 SOC_ENUM("EQ4 Cutoff", eq4_cutoff), 363 SOC_ENUM("EQ4 Cutoff", eq4_cutoff),
364 SOC_SINGLE_TLV("EQ4 Volume", WM8983_EQ4_PEAK_3, 0, 24, 1, eq_tlv), 364 SOC_SINGLE_TLV("EQ4 Volume", WM8983_EQ4_PEAK_3, 0, 24, 1, eq_tlv),
365 SOC_ENUM("EQ5 Cutoff", eq5_cutoff), 365 SOC_ENUM("EQ5 Cutoff", eq5_cutoff),
diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c
index dd6ce3bc01cf..18f2babe1090 100644
--- a/sound/soc/codecs/wm8985.c
+++ b/sound/soc/codecs/wm8985.c
@@ -371,13 +371,13 @@ static const struct snd_kcontrol_new wm8985_snd_controls[] = {
371 SOC_ENUM_EXT("Equalizer Function", eqmode, eqmode_get, eqmode_put), 371 SOC_ENUM_EXT("Equalizer Function", eqmode, eqmode_get, eqmode_put),
372 SOC_ENUM("EQ1 Cutoff", eq1_cutoff), 372 SOC_ENUM("EQ1 Cutoff", eq1_cutoff),
373 SOC_SINGLE_TLV("EQ1 Volume", WM8985_EQ1_LOW_SHELF, 0, 24, 1, eq_tlv), 373 SOC_SINGLE_TLV("EQ1 Volume", WM8985_EQ1_LOW_SHELF, 0, 24, 1, eq_tlv),
374 SOC_ENUM("EQ2 Bandwith", eq2_bw), 374 SOC_ENUM("EQ2 Bandwidth", eq2_bw),
375 SOC_ENUM("EQ2 Cutoff", eq2_cutoff), 375 SOC_ENUM("EQ2 Cutoff", eq2_cutoff),
376 SOC_SINGLE_TLV("EQ2 Volume", WM8985_EQ2_PEAK_1, 0, 24, 1, eq_tlv), 376 SOC_SINGLE_TLV("EQ2 Volume", WM8985_EQ2_PEAK_1, 0, 24, 1, eq_tlv),
377 SOC_ENUM("EQ3 Bandwith", eq3_bw), 377 SOC_ENUM("EQ3 Bandwidth", eq3_bw),
378 SOC_ENUM("EQ3 Cutoff", eq3_cutoff), 378 SOC_ENUM("EQ3 Cutoff", eq3_cutoff),
379 SOC_SINGLE_TLV("EQ3 Volume", WM8985_EQ3_PEAK_2, 0, 24, 1, eq_tlv), 379 SOC_SINGLE_TLV("EQ3 Volume", WM8985_EQ3_PEAK_2, 0, 24, 1, eq_tlv),
380 SOC_ENUM("EQ4 Bandwith", eq4_bw), 380 SOC_ENUM("EQ4 Bandwidth", eq4_bw),
381 SOC_ENUM("EQ4 Cutoff", eq4_cutoff), 381 SOC_ENUM("EQ4 Cutoff", eq4_cutoff),
382 SOC_SINGLE_TLV("EQ4 Volume", WM8985_EQ4_PEAK_3, 0, 24, 1, eq_tlv), 382 SOC_SINGLE_TLV("EQ4 Volume", WM8985_EQ4_PEAK_3, 0, 24, 1, eq_tlv),
383 SOC_ENUM("EQ5 Cutoff", eq5_cutoff), 383 SOC_ENUM("EQ5 Cutoff", eq5_cutoff),