aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2016-09-07 20:59:06 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-09-19 15:19:10 -0400
commit22511cfa7d98d5fec6086b3bae130caaf6b661fa (patch)
treef1d905aba4d4307c0603c812e08f255872fcf00d
parent5c8d8c0192385f448320f6b3bd00b3aaf68ab74f (diff)
[media] usb: 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> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-audio.c2
-rw-r--r--drivers/media/usb/em28xx/em28xx-audio.c2
-rw-r--r--drivers/media/usb/go7007/snd-go7007.c2
-rw-r--r--drivers/media/usb/tm6000/tm6000-alsa.c2
-rw-r--r--drivers/media/usb/usbtv/usbtv-audio.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-audio.c b/drivers/media/usb/cx231xx/cx231xx-audio.c
index 4cd5fa91612f..8263c4b0610b 100644
--- a/drivers/media/usb/cx231xx/cx231xx-audio.c
+++ b/drivers/media/usb/cx231xx/cx231xx-audio.c
@@ -635,7 +635,7 @@ static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs,
635 return vmalloc_to_page(pageptr); 635 return vmalloc_to_page(pageptr);
636} 636}
637 637
638static struct snd_pcm_ops snd_cx231xx_pcm_capture = { 638static const struct snd_pcm_ops snd_cx231xx_pcm_capture = {
639 .open = snd_cx231xx_capture_open, 639 .open = snd_cx231xx_capture_open,
640 .close = snd_cx231xx_pcm_close, 640 .close = snd_cx231xx_pcm_close,
641 .ioctl = snd_pcm_lib_ioctl, 641 .ioctl = snd_pcm_lib_ioctl,
diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c
index 78f3687772bf..e11fe46a547c 100644
--- a/drivers/media/usb/em28xx/em28xx-audio.c
+++ b/drivers/media/usb/em28xx/em28xx-audio.c
@@ -695,7 +695,7 @@ static int em28xx_cvol_new(struct snd_card *card, struct em28xx *dev,
695/* 695/*
696 * register/unregister code and data 696 * register/unregister code and data
697 */ 697 */
698static struct snd_pcm_ops snd_em28xx_pcm_capture = { 698static const struct snd_pcm_ops snd_em28xx_pcm_capture = {
699 .open = snd_em28xx_capture_open, 699 .open = snd_em28xx_capture_open,
700 .close = snd_em28xx_pcm_close, 700 .close = snd_em28xx_pcm_close,
701 .ioctl = snd_pcm_lib_ioctl, 701 .ioctl = snd_pcm_lib_ioctl,
diff --git a/drivers/media/usb/go7007/snd-go7007.c b/drivers/media/usb/go7007/snd-go7007.c
index d22d7d574672..070871fb1fc4 100644
--- a/drivers/media/usb/go7007/snd-go7007.c
+++ b/drivers/media/usb/go7007/snd-go7007.c
@@ -198,7 +198,7 @@ static struct page *go7007_snd_pcm_page(struct snd_pcm_substream *substream,
198 return vmalloc_to_page(substream->runtime->dma_area + offset); 198 return vmalloc_to_page(substream->runtime->dma_area + offset);
199} 199}
200 200
201static struct snd_pcm_ops go7007_snd_capture_ops = { 201static const struct snd_pcm_ops go7007_snd_capture_ops = {
202 .open = go7007_snd_capture_open, 202 .open = go7007_snd_capture_open,
203 .close = go7007_snd_capture_close, 203 .close = go7007_snd_capture_close,
204 .ioctl = snd_pcm_lib_ioctl, 204 .ioctl = snd_pcm_lib_ioctl,
diff --git a/drivers/media/usb/tm6000/tm6000-alsa.c b/drivers/media/usb/tm6000/tm6000-alsa.c
index e21c7aacecb6..f16fbd1f9f51 100644
--- a/drivers/media/usb/tm6000/tm6000-alsa.c
+++ b/drivers/media/usb/tm6000/tm6000-alsa.c
@@ -388,7 +388,7 @@ static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs,
388/* 388/*
389 * operators 389 * operators
390 */ 390 */
391static struct snd_pcm_ops snd_tm6000_pcm_ops = { 391static const struct snd_pcm_ops snd_tm6000_pcm_ops = {
392 .open = snd_tm6000_pcm_open, 392 .open = snd_tm6000_pcm_open,
393 .close = snd_tm6000_close, 393 .close = snd_tm6000_close,
394 .ioctl = snd_pcm_lib_ioctl, 394 .ioctl = snd_pcm_lib_ioctl,
diff --git a/drivers/media/usb/usbtv/usbtv-audio.c b/drivers/media/usb/usbtv/usbtv-audio.c
index 1965ff1b1f12..9db31db7d9ac 100644
--- a/drivers/media/usb/usbtv/usbtv-audio.c
+++ b/drivers/media/usb/usbtv/usbtv-audio.c
@@ -332,7 +332,7 @@ static snd_pcm_uframes_t snd_usbtv_pointer(struct snd_pcm_substream *substream)
332 return chip->snd_buffer_pos; 332 return chip->snd_buffer_pos;
333} 333}
334 334
335static struct snd_pcm_ops snd_usbtv_pcm_ops = { 335static const struct snd_pcm_ops snd_usbtv_pcm_ops = {
336 .open = snd_usbtv_pcm_open, 336 .open = snd_usbtv_pcm_open,
337 .close = snd_usbtv_pcm_close, 337 .close = snd_usbtv_pcm_close,
338 .ioctl = snd_pcm_lib_ioctl, 338 .ioctl = snd_pcm_lib_ioctl,