aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap
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/omap
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/omap')
-rw-r--r--sound/soc/omap/ams-delta.c2
-rw-r--r--sound/soc/omap/omap-hdmi.c2
-rw-r--r--sound/soc/omap/omap-mcbsp.c2
-rw-r--r--sound/soc/omap/omap-mcpdm.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index ccb8a6aa1817..a04a4338fdac 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -474,7 +474,7 @@ static int ams_delta_digital_mute(struct snd_soc_dai *dai, int mute)
474} 474}
475 475
476/* Our codec DAI probably doesn't have its own .ops structure */ 476/* Our codec DAI probably doesn't have its own .ops structure */
477static struct snd_soc_dai_ops ams_delta_dai_ops = { 477static const struct snd_soc_dai_ops ams_delta_dai_ops = {
478 .digital_mute = ams_delta_digital_mute, 478 .digital_mute = ams_delta_digital_mute,
479}; 479};
480 480
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index 36c6eaeffb02..9bb1cf89b4a4 100644
--- a/sound/soc/omap/omap-hdmi.c
+++ b/sound/soc/omap/omap-hdmi.c
@@ -83,7 +83,7 @@ static int omap_hdmi_dai_hw_params(struct snd_pcm_substream *substream,
83 return err; 83 return err;
84} 84}
85 85
86static struct snd_soc_dai_ops omap_hdmi_dai_ops = { 86static const struct snd_soc_dai_ops omap_hdmi_dai_ops = {
87 .startup = omap_hdmi_dai_startup, 87 .startup = omap_hdmi_dai_startup,
88 .hw_params = omap_hdmi_dai_hw_params, 88 .hw_params = omap_hdmi_dai_hw_params,
89}; 89};
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 4314647e735e..d91e6efd2600 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -599,7 +599,7 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
599 return err; 599 return err;
600} 600}
601 601
602static struct snd_soc_dai_ops mcbsp_dai_ops = { 602static const struct snd_soc_dai_ops mcbsp_dai_ops = {
603 .startup = omap_mcbsp_dai_startup, 603 .startup = omap_mcbsp_dai_startup,
604 .shutdown = omap_mcbsp_dai_shutdown, 604 .shutdown = omap_mcbsp_dai_shutdown,
605 .trigger = omap_mcbsp_dai_trigger, 605 .trigger = omap_mcbsp_dai_trigger,
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 41d17067cc73..cc8ceff25dbd 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -367,7 +367,7 @@ static int omap_mcpdm_prepare(struct snd_pcm_substream *substream,
367 return 0; 367 return 0;
368} 368}
369 369
370static struct snd_soc_dai_ops omap_mcpdm_dai_ops = { 370static const struct snd_soc_dai_ops omap_mcpdm_dai_ops = {
371 .startup = omap_mcpdm_dai_startup, 371 .startup = omap_mcpdm_dai_startup,
372 .shutdown = omap_mcpdm_dai_shutdown, 372 .shutdown = omap_mcpdm_dai_shutdown,
373 .hw_params = omap_mcpdm_dai_hw_params, 373 .hw_params = omap_mcpdm_dai_hw_params,