aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2011-11-23 05:40:40 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-23 05:40:46 -0500
commit85e7652d89293a6dab42bfd31f276f8bc072d4c5 (patch)
tree648de4f4e055ccd0c687184c3fc56e4f56bc3e16 /sound/soc/samsung
parentbea0ed0825be288f9fc98696fc476066776b26be (diff)
ASoC: Constify snd_soc_dai_ops structs
Commit 1ee46ebd("ASoC: Make the DAI ops constant in the DAI structure") introduced the possibility to have constant DAI ops structures, yet this is barley used in both existing drivers and also new drivers being submitted, although none of them modifies its DAI ops structure. The later is not surprising since existing drivers are often used as templates for new drivers. So this patch just constifies all existing snd_soc_dai_ops structs to eliminate the issue altogether. The patch was generated with the following coccinelle semantic patch: // <smpl> @@ identifier ops; @@ -struct snd_soc_dai_ops ops = +const struct snd_soc_dai_ops ops = { ... }; // </smpl> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r--sound/soc/samsung/ac97.c4
-rw-r--r--sound/soc/samsung/i2s.c2
-rw-r--r--sound/soc/samsung/pcm.c2
-rw-r--r--sound/soc/samsung/s3c2412-i2s.c2
-rw-r--r--sound/soc/samsung/s3c24xx-i2s.c2
-rw-r--r--sound/soc/samsung/spdif.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/samsung/ac97.c b/sound/soc/samsung/ac97.c
index 16521e3ffc0c..09035afdeb74 100644
--- a/sound/soc/samsung/ac97.c
+++ b/sound/soc/samsung/ac97.c
@@ -329,12 +329,12 @@ static int s3c_ac97_mic_trigger(struct snd_pcm_substream *substream,
329 return 0; 329 return 0;
330} 330}
331 331
332static struct snd_soc_dai_ops s3c_ac97_dai_ops = { 332static const struct snd_soc_dai_ops s3c_ac97_dai_ops = {
333 .hw_params = s3c_ac97_hw_params, 333 .hw_params = s3c_ac97_hw_params,
334 .trigger = s3c_ac97_trigger, 334 .trigger = s3c_ac97_trigger,
335}; 335};
336 336
337static struct snd_soc_dai_ops s3c_ac97_mic_dai_ops = { 337static const struct snd_soc_dai_ops s3c_ac97_mic_dai_ops = {
338 .hw_params = s3c_ac97_hw_mic_params, 338 .hw_params = s3c_ac97_hw_mic_params,
339 .trigger = s3c_ac97_mic_trigger, 339 .trigger = s3c_ac97_mic_trigger,
340}; 340};
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index bff42bf370b9..03ee8ce46a29 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -923,7 +923,7 @@ static int samsung_i2s_dai_remove(struct snd_soc_dai *dai)
923 return 0; 923 return 0;
924} 924}
925 925
926static struct snd_soc_dai_ops samsung_i2s_dai_ops = { 926static const struct snd_soc_dai_ops samsung_i2s_dai_ops = {
927 .trigger = i2s_trigger, 927 .trigger = i2s_trigger,
928 .hw_params = i2s_hw_params, 928 .hw_params = i2s_hw_params,
929 .set_fmt = i2s_set_fmt, 929 .set_fmt = i2s_set_fmt,
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index 05a47cf7f06e..2df2762f3000 100644
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -452,7 +452,7 @@ static int s3c_pcm_set_sysclk(struct snd_soc_dai *cpu_dai,
452 return 0; 452 return 0;
453} 453}
454 454
455static struct snd_soc_dai_ops s3c_pcm_dai_ops = { 455static const struct snd_soc_dai_ops s3c_pcm_dai_ops = {
456 .set_sysclk = s3c_pcm_set_sysclk, 456 .set_sysclk = s3c_pcm_set_sysclk,
457 .set_clkdiv = s3c_pcm_set_clkdiv, 457 .set_clkdiv = s3c_pcm_set_clkdiv,
458 .trigger = s3c_pcm_trigger, 458 .trigger = s3c_pcm_trigger,
diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c
index 7bbec25e6e15..545773d0641c 100644
--- a/sound/soc/samsung/s3c2412-i2s.c
+++ b/sound/soc/samsung/s3c2412-i2s.c
@@ -142,7 +142,7 @@ static int s3c2412_i2s_hw_params(struct snd_pcm_substream *substream,
142 SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ 142 SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
143 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) 143 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
144 144
145static struct snd_soc_dai_ops s3c2412_i2s_dai_ops = { 145static const struct snd_soc_dai_ops s3c2412_i2s_dai_ops = {
146 .hw_params = s3c2412_i2s_hw_params, 146 .hw_params = s3c2412_i2s_hw_params,
147}; 147};
148 148
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c
index 558c64bbed2e..2a98bed2db02 100644
--- a/sound/soc/samsung/s3c24xx-i2s.c
+++ b/sound/soc/samsung/s3c24xx-i2s.c
@@ -444,7 +444,7 @@ static int s3c24xx_i2s_resume(struct snd_soc_dai *cpu_dai)
444 SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ 444 SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
445 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000) 445 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
446 446
447static struct snd_soc_dai_ops s3c24xx_i2s_dai_ops = { 447static const struct snd_soc_dai_ops s3c24xx_i2s_dai_ops = {
448 .trigger = s3c24xx_i2s_trigger, 448 .trigger = s3c24xx_i2s_trigger,
449 .hw_params = s3c24xx_i2s_hw_params, 449 .hw_params = s3c24xx_i2s_hw_params,
450 .set_fmt = s3c24xx_i2s_set_fmt, 450 .set_fmt = s3c24xx_i2s_set_fmt,
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c
index 468cff1bb1af..a1fee1a414c9 100644
--- a/sound/soc/samsung/spdif.c
+++ b/sound/soc/samsung/spdif.c
@@ -334,7 +334,7 @@ static int spdif_resume(struct snd_soc_dai *cpu_dai)
334#define spdif_resume NULL 334#define spdif_resume NULL
335#endif 335#endif
336 336
337static struct snd_soc_dai_ops spdif_dai_ops = { 337static const struct snd_soc_dai_ops spdif_dai_ops = {
338 .set_sysclk = spdif_set_sysclk, 338 .set_sysclk = spdif_set_sysclk,
339 .trigger = spdif_trigger, 339 .trigger = spdif_trigger,
340 .hw_params = spdif_hw_params, 340 .hw_params = spdif_hw_params,