Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38a54f35 authored by Jonathan Corbet's avatar Jonathan Corbet Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13377): make struct videobuf_queue_ops constant 



The videobuf_queue_ops function vector is not declared constant, but
there's no need for the videobuf layer to ever change it.  Make it const
so that videobuf users can make their operations const without warnings.

Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b18bd1d8

drivers/media/video/videobuf-core.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ EXPORT_SYMBOL_GPL(videobuf_queue_to_vmalloc); 




void videobuf_queue_core_init(struct videobuf_queue *q,

			 struct videobuf_queue_ops *ops,

			 const struct videobuf_queue_ops *ops,

			 struct device *dev,

			 spinlock_t *irqlock,

			 enum v4l2_buf_type type,

drivers/media/video/videobuf-dma-contig.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static struct videobuf_qtype_ops qops = { 
};



void videobuf_queue_dma_contig_init(struct videobuf_queue *q,

				    struct videobuf_queue_ops *ops,

				    const struct videobuf_queue_ops *ops,

				    struct device *dev,

				    spinlock_t *irqlock,

				    enum v4l2_buf_type type,

drivers/media/video/videobuf-dma-sg.c

+1 −1
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ void *videobuf_sg_alloc(size_t size) 
}



void videobuf_queue_sg_init(struct videobuf_queue* q,

			 struct videobuf_queue_ops *ops,

			 const struct videobuf_queue_ops *ops,

			 struct device *dev,

			 spinlock_t *irqlock,

			 enum v4l2_buf_type type,

drivers/media/video/videobuf-vmalloc.c

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static struct videobuf_qtype_ops qops = { 
};



void videobuf_queue_vmalloc_init(struct videobuf_queue* q,

			 struct videobuf_queue_ops *ops,

			 const struct videobuf_queue_ops *ops,

			 void *dev,

			 spinlock_t *irqlock,

			 enum v4l2_buf_type type,

include/media/videobuf-core.h

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ struct videobuf_queue { 
	enum v4l2_field            field;

	enum v4l2_field            last;   /* for field=V4L2_FIELD_ALTERNATE */

	struct videobuf_buffer     *bufs[VIDEO_MAX_FRAME];

	struct videobuf_queue_ops  *ops;

	const struct videobuf_queue_ops  *ops;

	struct videobuf_qtype_ops  *int_ops;



	unsigned int               streaming:1;
@@ -195,7 +195,7 @@ void *videobuf_queue_to_vmalloc (struct videobuf_queue* q, 
				 struct videobuf_buffer *buf);



void videobuf_queue_core_init(struct videobuf_queue *q,

			 struct videobuf_queue_ops *ops,

			 const struct videobuf_queue_ops *ops,

			 struct device *dev,

			 spinlock_t *irqlock,

			 enum v4l2_buf_type type,