aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/oss/sb_ess.c2
-rw-r--r--sound/pci/au88x0/au88x0_pcm.c2
-rw-r--r--sound/soc/atmel/atmel_ssc_dai.c2
-rw-r--r--sound/soc/codecs/ak4641.c2
-rw-r--r--sound/soc/codecs/mc13783.c2
-rw-r--r--sound/soc/codecs/tas5086.c2
-rw-r--r--sound/soc/codecs/twl6040.c4
-rw-r--r--sound/soc/fsl/fsl_spdif.c4
-rw-r--r--sound/soc/tegra/tegra20_i2s.c6
-rw-r--r--sound/soc/tegra/tegra20_spdif.c6
-rw-r--r--sound/soc/tegra/tegra30_ahub.c4
-rw-r--r--sound/soc/tegra/tegra30_i2s.c4
12 files changed, 20 insertions, 20 deletions
diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c
index c0be085e4a20..0e7254bde4c2 100644
--- a/sound/oss/sb_ess.c
+++ b/sound/oss/sb_ess.c
@@ -1544,7 +1544,7 @@ static int ess_has_rec_mixer (int submodel)
1544 return 1; 1544 return 1;
1545 default: 1545 default:
1546 return 0; 1546 return 0;
1547 }; 1547 }
1548}; 1548};
1549 1549
1550#ifdef FKS_LOGGING 1550#ifdef FKS_LOGGING
diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c
index b46dc9b24dbd..9fb03b4ea925 100644
--- a/sound/pci/au88x0/au88x0_pcm.c
+++ b/sound/pci/au88x0/au88x0_pcm.c
@@ -671,7 +671,7 @@ static int snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)
671 return err; 671 return err;
672 break; 672 break;
673#endif 673#endif
674 }; 674 }
675 675
676 if (VORTEX_PCM_TYPE(pcm) == VORTEX_PCM_SPDIF) { 676 if (VORTEX_PCM_TYPE(pcm) == VORTEX_PCM_SPDIF) {
677 for (i = 0; i < ARRAY_SIZE(snd_vortex_mixer_spdif); i++) { 677 for (i = 0; i < ARRAY_SIZE(snd_vortex_mixer_spdif); i++) {
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index bb53dea85b17..8697cedccd21 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -777,7 +777,7 @@ static int asoc_ssc_init(struct device *dev)
777 if (ret) { 777 if (ret) {
778 dev_err(dev, "Could not register PCM: %d\n", ret); 778 dev_err(dev, "Could not register PCM: %d\n", ret);
779 goto err_unregister_dai; 779 goto err_unregister_dai;
780 }; 780 }
781 781
782 return 0; 782 return 0;
783 783
diff --git a/sound/soc/codecs/ak4641.c b/sound/soc/codecs/ak4641.c
index 5f9af1fb76e8..49cc5f6d6dba 100644
--- a/sound/soc/codecs/ak4641.c
+++ b/sound/soc/codecs/ak4641.c
@@ -328,7 +328,7 @@ static int ak4641_i2s_hw_params(struct snd_pcm_substream *substream,
328 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { 328 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
329 ak4641->playback_fs = rate; 329 ak4641->playback_fs = rate;
330 ak4641_set_deemph(codec); 330 ak4641_set_deemph(codec);
331 }; 331 }
332 332
333 return 0; 333 return 0;
334} 334}
diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c
index ea141e1d6f28..154433084708 100644
--- a/sound/soc/codecs/mc13783.c
+++ b/sound/soc/codecs/mc13783.c
@@ -382,7 +382,7 @@ static int mc13783_set_tdm_slot_dac(struct snd_soc_dai *dai,
382 break; 382 break;
383 default: 383 default:
384 return -EINVAL; 384 return -EINVAL;
385 }; 385 }
386 386
387 snd_soc_update_bits(codec, MC13783_SSI_NETWORK, mask, val); 387 snd_soc_update_bits(codec, MC13783_SSI_NETWORK, mask, val);
388 388
diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c
index 6d31d88f7204..e29cdb7ee232 100644
--- a/sound/soc/codecs/tas5086.c
+++ b/sound/soc/codecs/tas5086.c
@@ -429,7 +429,7 @@ static int tas5086_hw_params(struct snd_pcm_substream *substream,
429 default: 429 default:
430 dev_err(codec->dev, "Invalid bit width\n"); 430 dev_err(codec->dev, "Invalid bit width\n");
431 return -EINVAL; 431 return -EINVAL;
432 }; 432 }
433 433
434 ret = regmap_write(priv->regmap, TAS5086_SERIAL_DATA_IF, val); 434 ret = regmap_write(priv->regmap, TAS5086_SERIAL_DATA_IF, val);
435 if (ret < 0) 435 if (ret < 0)
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index 3c79dbb6c323..35059a242fa4 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -246,7 +246,7 @@ static bool twl6040_is_path_unmuted(struct snd_soc_codec *codec,
246 return priv->dl2_unmuted; 246 return priv->dl2_unmuted;
247 default: 247 default:
248 return 1; 248 return 1;
249 }; 249 }
250} 250}
251 251
252/* 252/*
@@ -1100,7 +1100,7 @@ static void twl6040_mute_path(struct snd_soc_codec *codec, enum twl6040_dai_id i
1100 break; 1100 break;
1101 default: 1101 default:
1102 break; 1102 break;
1103 }; 1103 }
1104} 1104}
1105 1105
1106static int twl6040_digital_mute(struct snd_soc_dai *dai, int mute) 1106static int twl6040_digital_mute(struct snd_soc_dai *dai, int mute)
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index 3920c3e849ce..c0fea02114e1 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -963,7 +963,7 @@ static bool fsl_spdif_readable_reg(struct device *dev, unsigned int reg)
963 return true; 963 return true;
964 default: 964 default:
965 return false; 965 return false;
966 }; 966 }
967} 967}
968 968
969static bool fsl_spdif_writeable_reg(struct device *dev, unsigned int reg) 969static bool fsl_spdif_writeable_reg(struct device *dev, unsigned int reg)
@@ -982,7 +982,7 @@ static bool fsl_spdif_writeable_reg(struct device *dev, unsigned int reg)
982 return true; 982 return true;
983 default: 983 default:
984 return false; 984 return false;
985 }; 985 }
986} 986}
987 987
988static const struct regmap_config fsl_spdif_regmap_config = { 988static const struct regmap_config fsl_spdif_regmap_config = {
diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index 52af7f6fb37f..364bf6a907e1 100644
--- a/sound/soc/tegra/tegra20_i2s.c
+++ b/sound/soc/tegra/tegra20_i2s.c
@@ -297,7 +297,7 @@ static bool tegra20_i2s_wr_rd_reg(struct device *dev, unsigned int reg)
297 return true; 297 return true;
298 default: 298 default:
299 return false; 299 return false;
300 }; 300 }
301} 301}
302 302
303static bool tegra20_i2s_volatile_reg(struct device *dev, unsigned int reg) 303static bool tegra20_i2s_volatile_reg(struct device *dev, unsigned int reg)
@@ -310,7 +310,7 @@ static bool tegra20_i2s_volatile_reg(struct device *dev, unsigned int reg)
310 return true; 310 return true;
311 default: 311 default:
312 return false; 312 return false;
313 }; 313 }
314} 314}
315 315
316static bool tegra20_i2s_precious_reg(struct device *dev, unsigned int reg) 316static bool tegra20_i2s_precious_reg(struct device *dev, unsigned int reg)
@@ -321,7 +321,7 @@ static bool tegra20_i2s_precious_reg(struct device *dev, unsigned int reg)
321 return true; 321 return true;
322 default: 322 default:
323 return false; 323 return false;
324 }; 324 }
325} 325}
326 326
327static const struct regmap_config tegra20_i2s_regmap_config = { 327static const struct regmap_config tegra20_i2s_regmap_config = {
diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c
index 551b3c93ce93..08bc6931c7c7 100644
--- a/sound/soc/tegra/tegra20_spdif.c
+++ b/sound/soc/tegra/tegra20_spdif.c
@@ -213,7 +213,7 @@ static bool tegra20_spdif_wr_rd_reg(struct device *dev, unsigned int reg)
213 return true; 213 return true;
214 default: 214 default:
215 return false; 215 return false;
216 }; 216 }
217} 217}
218 218
219static bool tegra20_spdif_volatile_reg(struct device *dev, unsigned int reg) 219static bool tegra20_spdif_volatile_reg(struct device *dev, unsigned int reg)
@@ -234,7 +234,7 @@ static bool tegra20_spdif_volatile_reg(struct device *dev, unsigned int reg)
234 return true; 234 return true;
235 default: 235 default:
236 return false; 236 return false;
237 }; 237 }
238} 238}
239 239
240static bool tegra20_spdif_precious_reg(struct device *dev, unsigned int reg) 240static bool tegra20_spdif_precious_reg(struct device *dev, unsigned int reg)
@@ -247,7 +247,7 @@ static bool tegra20_spdif_precious_reg(struct device *dev, unsigned int reg)
247 return true; 247 return true;
248 default: 248 default:
249 return false; 249 return false;
250 }; 250 }
251} 251}
252 252
253static const struct regmap_config tegra20_spdif_regmap_config = { 253static const struct regmap_config tegra20_spdif_regmap_config = {
diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c
index d554d46d08b5..805b1f399dc3 100644
--- a/sound/soc/tegra/tegra30_ahub.c
+++ b/sound/soc/tegra/tegra30_ahub.c
@@ -346,7 +346,7 @@ static bool tegra30_ahub_apbif_wr_rd_reg(struct device *dev, unsigned int reg)
346 return true; 346 return true;
347 default: 347 default:
348 break; 348 break;
349 }; 349 }
350 350
351 if (REG_IN_ARRAY(reg, CHANNEL_CTRL) || 351 if (REG_IN_ARRAY(reg, CHANNEL_CTRL) ||
352 REG_IN_ARRAY(reg, CHANNEL_CLEAR) || 352 REG_IN_ARRAY(reg, CHANNEL_CLEAR) ||
@@ -381,7 +381,7 @@ static bool tegra30_ahub_apbif_volatile_reg(struct device *dev,
381 return true; 381 return true;
382 default: 382 default:
383 break; 383 break;
384 }; 384 }
385 385
386 if (REG_IN_ARRAY(reg, CHANNEL_CLEAR) || 386 if (REG_IN_ARRAY(reg, CHANNEL_CLEAR) ||
387 REG_IN_ARRAY(reg, CHANNEL_STATUS) || 387 REG_IN_ARRAY(reg, CHANNEL_STATUS) ||
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index 47565fd04505..bd71145f3639 100644
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -369,7 +369,7 @@ static bool tegra30_i2s_wr_rd_reg(struct device *dev, unsigned int reg)
369 return true; 369 return true;
370 default: 370 default:
371 return false; 371 return false;
372 }; 372 }
373} 373}
374 374
375static bool tegra30_i2s_volatile_reg(struct device *dev, unsigned int reg) 375static bool tegra30_i2s_volatile_reg(struct device *dev, unsigned int reg)
@@ -382,7 +382,7 @@ static bool tegra30_i2s_volatile_reg(struct device *dev, unsigned int reg)
382 return true; 382 return true;
383 default: 383 default:
384 return false; 384 return false;
385 }; 385 }
386} 386}
387 387
388static const struct regmap_config tegra30_i2s_regmap_config = { 388static const struct regmap_config tegra30_i2s_regmap_config = {