diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2016-09-01 18:13:11 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-09-02 05:50:11 -0400 |
commit | 5116ffc32d889d229843cb1d12060491b01eae21 (patch) | |
tree | 8ba5096e591c3b3a7ca0c180cdf401c4da785c55 | |
parent | 6769e988b0062bf8d63d35b0fdbb47b385dd3252 (diff) |
ALSA: firewire: constify snd_pcm_ops structures
Check for snd_pcm_ops structures that are only stored in the ops field of a
snd_soc_platform_driver structure or passed as the third argument to
snd_pcm_set_ops. The corresponding field or parameter is declared const,
so snd_pcm_ops structures that have this property can be declared as const
also.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@r disable optional_qualifier@
identifier i;
position p;
@@
static struct snd_pcm_ops i@p = { ... };
@ok1@
identifier r.i;
struct snd_soc_platform_driver e;
position p;
@@
e.ops = &i@p;
@ok2@
identifier r.i;
expression e1, e2;
position p;
@@
snd_pcm_set_ops(e1, e2, &i@p)
@bad@
position p != {r.p,ok1.p,ok2.p};
identifier r.i;
struct snd_pcm_ops e;
@@
e@i@p
@depends on !bad disable optional_qualifier@
identifier r.i;
@@
static
+const
struct snd_pcm_ops i = { ... };
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/firewire/dice/dice-pcm.c | 4 | ||||
-rw-r--r-- | sound/firewire/digi00x/digi00x-pcm.c | 4 | ||||
-rw-r--r-- | sound/firewire/oxfw/oxfw-pcm.c | 4 | ||||
-rw-r--r-- | sound/firewire/tascam/tascam-pcm.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sound/firewire/dice/dice-pcm.c b/sound/firewire/dice/dice-pcm.c index 4aa0249826fd..6074fe1f00f7 100644 --- a/sound/firewire/dice/dice-pcm.c +++ b/sound/firewire/dice/dice-pcm.c | |||
@@ -302,7 +302,7 @@ static snd_pcm_uframes_t playback_pointer(struct snd_pcm_substream *substream) | |||
302 | 302 | ||
303 | int snd_dice_create_pcm(struct snd_dice *dice) | 303 | int snd_dice_create_pcm(struct snd_dice *dice) |
304 | { | 304 | { |
305 | static struct snd_pcm_ops capture_ops = { | 305 | static const struct snd_pcm_ops capture_ops = { |
306 | .open = pcm_open, | 306 | .open = pcm_open, |
307 | .close = pcm_close, | 307 | .close = pcm_close, |
308 | .ioctl = snd_pcm_lib_ioctl, | 308 | .ioctl = snd_pcm_lib_ioctl, |
@@ -314,7 +314,7 @@ int snd_dice_create_pcm(struct snd_dice *dice) | |||
314 | .page = snd_pcm_lib_get_vmalloc_page, | 314 | .page = snd_pcm_lib_get_vmalloc_page, |
315 | .mmap = snd_pcm_lib_mmap_vmalloc, | 315 | .mmap = snd_pcm_lib_mmap_vmalloc, |
316 | }; | 316 | }; |
317 | static struct snd_pcm_ops playback_ops = { | 317 | static const struct snd_pcm_ops playback_ops = { |
318 | .open = pcm_open, | 318 | .open = pcm_open, |
319 | .close = pcm_close, | 319 | .close = pcm_close, |
320 | .ioctl = snd_pcm_lib_ioctl, | 320 | .ioctl = snd_pcm_lib_ioctl, |
diff --git a/sound/firewire/digi00x/digi00x-pcm.c b/sound/firewire/digi00x/digi00x-pcm.c index cac28f70aef7..613f05872770 100644 --- a/sound/firewire/digi00x/digi00x-pcm.c +++ b/sound/firewire/digi00x/digi00x-pcm.c | |||
@@ -329,7 +329,7 @@ static snd_pcm_uframes_t pcm_playback_pointer(struct snd_pcm_substream *sbstrm) | |||
329 | return amdtp_stream_pcm_pointer(&dg00x->rx_stream); | 329 | return amdtp_stream_pcm_pointer(&dg00x->rx_stream); |
330 | } | 330 | } |
331 | 331 | ||
332 | static struct snd_pcm_ops pcm_capture_ops = { | 332 | static const struct snd_pcm_ops pcm_capture_ops = { |
333 | .open = pcm_open, | 333 | .open = pcm_open, |
334 | .close = pcm_close, | 334 | .close = pcm_close, |
335 | .ioctl = snd_pcm_lib_ioctl, | 335 | .ioctl = snd_pcm_lib_ioctl, |
@@ -341,7 +341,7 @@ static struct snd_pcm_ops pcm_capture_ops = { | |||
341 | .page = snd_pcm_lib_get_vmalloc_page, | 341 | .page = snd_pcm_lib_get_vmalloc_page, |
342 | }; | 342 | }; |
343 | 343 | ||
344 | static struct snd_pcm_ops pcm_playback_ops = { | 344 | static const struct snd_pcm_ops pcm_playback_ops = { |
345 | .open = pcm_open, | 345 | .open = pcm_open, |
346 | .close = pcm_close, | 346 | .close = pcm_close, |
347 | .ioctl = snd_pcm_lib_ioctl, | 347 | .ioctl = snd_pcm_lib_ioctl, |
diff --git a/sound/firewire/oxfw/oxfw-pcm.c b/sound/firewire/oxfw/oxfw-pcm.c index 8d233417695d..f3530f89a025 100644 --- a/sound/firewire/oxfw/oxfw-pcm.c +++ b/sound/firewire/oxfw/oxfw-pcm.c | |||
@@ -388,7 +388,7 @@ static snd_pcm_uframes_t pcm_playback_pointer(struct snd_pcm_substream *sbstm) | |||
388 | 388 | ||
389 | int snd_oxfw_create_pcm(struct snd_oxfw *oxfw) | 389 | int snd_oxfw_create_pcm(struct snd_oxfw *oxfw) |
390 | { | 390 | { |
391 | static struct snd_pcm_ops capture_ops = { | 391 | static const struct snd_pcm_ops capture_ops = { |
392 | .open = pcm_open, | 392 | .open = pcm_open, |
393 | .close = pcm_close, | 393 | .close = pcm_close, |
394 | .ioctl = snd_pcm_lib_ioctl, | 394 | .ioctl = snd_pcm_lib_ioctl, |
@@ -400,7 +400,7 @@ int snd_oxfw_create_pcm(struct snd_oxfw *oxfw) | |||
400 | .page = snd_pcm_lib_get_vmalloc_page, | 400 | .page = snd_pcm_lib_get_vmalloc_page, |
401 | .mmap = snd_pcm_lib_mmap_vmalloc, | 401 | .mmap = snd_pcm_lib_mmap_vmalloc, |
402 | }; | 402 | }; |
403 | static struct snd_pcm_ops playback_ops = { | 403 | static const struct snd_pcm_ops playback_ops = { |
404 | .open = pcm_open, | 404 | .open = pcm_open, |
405 | .close = pcm_close, | 405 | .close = pcm_close, |
406 | .ioctl = snd_pcm_lib_ioctl, | 406 | .ioctl = snd_pcm_lib_ioctl, |
diff --git a/sound/firewire/tascam/tascam-pcm.c b/sound/firewire/tascam/tascam-pcm.c index 380d3db969a5..79db1b651f5c 100644 --- a/sound/firewire/tascam/tascam-pcm.c +++ b/sound/firewire/tascam/tascam-pcm.c | |||
@@ -268,7 +268,7 @@ static snd_pcm_uframes_t pcm_playback_pointer(struct snd_pcm_substream *sbstrm) | |||
268 | return amdtp_stream_pcm_pointer(&tscm->rx_stream); | 268 | return amdtp_stream_pcm_pointer(&tscm->rx_stream); |
269 | } | 269 | } |
270 | 270 | ||
271 | static struct snd_pcm_ops pcm_capture_ops = { | 271 | static const struct snd_pcm_ops pcm_capture_ops = { |
272 | .open = pcm_open, | 272 | .open = pcm_open, |
273 | .close = pcm_close, | 273 | .close = pcm_close, |
274 | .ioctl = snd_pcm_lib_ioctl, | 274 | .ioctl = snd_pcm_lib_ioctl, |
@@ -280,7 +280,7 @@ static struct snd_pcm_ops pcm_capture_ops = { | |||
280 | .page = snd_pcm_lib_get_vmalloc_page, | 280 | .page = snd_pcm_lib_get_vmalloc_page, |
281 | }; | 281 | }; |
282 | 282 | ||
283 | static struct snd_pcm_ops pcm_playback_ops = { | 283 | static const struct snd_pcm_ops pcm_playback_ops = { |
284 | .open = pcm_open, | 284 | .open = pcm_open, |
285 | .close = pcm_close, | 285 | .close = pcm_close, |
286 | .ioctl = snd_pcm_lib_ioctl, | 286 | .ioctl = snd_pcm_lib_ioctl, |