Commit 38ffab3b authored Aug 04, 2017 by Julia Lawall Committed by Mauro Carvalho Chehab Aug 09, 2017

media: staging: media: atomisp: constify videobuf_queue_ops structures



These videobuf_queue_ops structures are only passed as the second
argument to videobuf_queue_vmalloc_init, which is declared as const.
Thus the videobuf_queue_ops structures themselves can be const.

Done with the help of Coccinelle.

// <smpl>
@r disable optional_qualifier@
identifier i;
position p;
@@
static struct videobuf_queue_ops i@p = { ... };

@ok1@
identifier r.i;
expression e1;
position p;
@@
videobuf_queue_vmalloc_init(e1,&i@p,...)

@bad@
position p != {r.p,ok1.p};
identifier r.i;
struct videobuf_queue_ops e;
@@
e@i@p

@depends on !bad disable optional_qualifier@
identifier r.i;
@@
static
+const
 struct videobuf_queue_ops i = { ... };
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

parent df0347f3

drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -643,14 +643,14 @@ static void atomisp_buf_release_output(struct videobuf_queue *vq,
		vb->state = VIDEOBUF_NEEDS_INIT;
		}

		static struct videobuf_queue_ops videobuf_qops = {
		static const struct videobuf_queue_ops videobuf_qops = {
		.buf_setup = atomisp_buf_setup,
		.buf_prepare = atomisp_buf_prepare,
		.buf_queue = atomisp_buf_queue,
		.buf_release = atomisp_buf_release,
		};

		static struct videobuf_queue_ops videobuf_qops_output = {
		static const struct videobuf_queue_ops videobuf_qops_output = {
		.buf_setup = atomisp_buf_setup_output,
		.buf_prepare = atomisp_buf_prepare_output,
		.buf_queue = atomisp_buf_queue_output,

Admin message