aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
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/pxa
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/pxa')
-rw-r--r--sound/soc/pxa/pxa-ssp.c2
-rw-r--r--sound/soc/pxa/pxa2xx-ac97.c6
-rw-r--r--sound/soc/pxa/pxa2xx-i2s.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 8ad93ee2e92..9c9a51ef67c 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -771,7 +771,7 @@ static int pxa_ssp_remove(struct snd_soc_dai *dai)
771 SNDRV_PCM_FMTBIT_S24_LE | \ 771 SNDRV_PCM_FMTBIT_S24_LE | \
772 SNDRV_PCM_FMTBIT_S32_LE) 772 SNDRV_PCM_FMTBIT_S32_LE)
773 773
774static struct snd_soc_dai_ops pxa_ssp_dai_ops = { 774static const struct snd_soc_dai_ops pxa_ssp_dai_ops = {
775 .startup = pxa_ssp_startup, 775 .startup = pxa_ssp_startup,
776 .shutdown = pxa_ssp_shutdown, 776 .shutdown = pxa_ssp_shutdown,
777 .trigger = pxa_ssp_trigger, 777 .trigger = pxa_ssp_trigger,
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index ac51c6d25c4..3fec2f35b8f 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -163,15 +163,15 @@ static int pxa2xx_ac97_hw_mic_params(struct snd_pcm_substream *substream,
163 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \ 163 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \
164 SNDRV_PCM_RATE_48000) 164 SNDRV_PCM_RATE_48000)
165 165
166static struct snd_soc_dai_ops pxa_ac97_hifi_dai_ops = { 166static const struct snd_soc_dai_ops pxa_ac97_hifi_dai_ops = {
167 .hw_params = pxa2xx_ac97_hw_params, 167 .hw_params = pxa2xx_ac97_hw_params,
168}; 168};
169 169
170static struct snd_soc_dai_ops pxa_ac97_aux_dai_ops = { 170static const struct snd_soc_dai_ops pxa_ac97_aux_dai_ops = {
171 .hw_params = pxa2xx_ac97_hw_aux_params, 171 .hw_params = pxa2xx_ac97_hw_aux_params,
172}; 172};
173 173
174static struct snd_soc_dai_ops pxa_ac97_mic_dai_ops = { 174static const struct snd_soc_dai_ops pxa_ac97_mic_dai_ops = {
175 .hw_params = pxa2xx_ac97_hw_mic_params, 175 .hw_params = pxa2xx_ac97_hw_mic_params,
176}; 176};
177 177
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 11be5952a50..609abd51e55 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -331,7 +331,7 @@ static int pxa2xx_i2s_remove(struct snd_soc_dai *dai)
331 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \ 331 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \
332 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000) 332 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000)
333 333
334static struct snd_soc_dai_ops pxa_i2s_dai_ops = { 334static const struct snd_soc_dai_ops pxa_i2s_dai_ops = {
335 .startup = pxa2xx_i2s_startup, 335 .startup = pxa2xx_i2s_startup,
336 .shutdown = pxa2xx_i2s_shutdown, 336 .shutdown = pxa2xx_i2s_shutdown,
337 .trigger = pxa2xx_i2s_trigger, 337 .trigger = pxa2xx_i2s_trigger,