aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2011-12-22 00:29:07 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-01-06 08:05:21 -0500
commit527f18be2d69db4752e5b7f227548a075a37749b (patch)
treeb8ad4c713098f18d7250c857e1f3fb89707bb1ab /drivers
parentccd1a499c1675fef5d2a138617507add63cb81db (diff)
[media] Staging: dt3155v4l: update to newer API
I changed the function definitions for dt3155_queue_setup() to match the newer API. The dt3155_start_streaming() function didn't do anything so I just removed it. This silences the following gcc warnings: drivers/staging/media/dt3155v4l/dt3155v4l.c:307:2: warning: initialization from incompatible pointer type [enabled by default] drivers/staging/media/dt3155v4l/dt3155v4l.c:307:2: warning: (near initialization for ‘q_ops.queue_setup’) [enabled by default] drivers/staging/media/dt3155v4l/dt3155v4l.c:311:2: warning: initialization from incompatible pointer type [enabled by default] drivers/staging/media/dt3155v4l/dt3155v4l.c:311:2: warning: (near initialization for ‘q_ops.start_streaming’) [enabled by default] Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/media/dt3155v4l/dt3155v4l.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index 04e93c49f03a..25c6025eb54f 100644
--- a/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -218,9 +218,10 @@ dt3155_start_acq(struct dt3155_priv *pd)
218 * driver-specific callbacks (vb2_ops) 218 * driver-specific callbacks (vb2_ops)
219 */ 219 */
220static int 220static int
221dt3155_queue_setup(struct vb2_queue *q, unsigned int *num_buffers, 221dt3155_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
222 unsigned int *num_planes, unsigned long sizes[], 222 unsigned int *num_buffers, unsigned int *num_planes,
223 void *alloc_ctxs[]) 223 unsigned int sizes[], void *alloc_ctxs[])
224
224{ 225{
225 struct dt3155_priv *pd = vb2_get_drv_priv(q); 226 struct dt3155_priv *pd = vb2_get_drv_priv(q);
226 void *ret; 227 void *ret;
@@ -262,12 +263,6 @@ dt3155_buf_prepare(struct vb2_buffer *vb)
262} 263}
263 264
264static int 265static int
265dt3155_start_streaming(struct vb2_queue *q)
266{
267 return 0;
268}
269
270static int
271dt3155_stop_streaming(struct vb2_queue *q) 266dt3155_stop_streaming(struct vb2_queue *q)
272{ 267{
273 struct dt3155_priv *pd = vb2_get_drv_priv(q); 268 struct dt3155_priv *pd = vb2_get_drv_priv(q);
@@ -308,7 +303,6 @@ const struct vb2_ops q_ops = {
308 .wait_prepare = dt3155_wait_prepare, 303 .wait_prepare = dt3155_wait_prepare,
309 .wait_finish = dt3155_wait_finish, 304 .wait_finish = dt3155_wait_finish,
310 .buf_prepare = dt3155_buf_prepare, 305 .buf_prepare = dt3155_buf_prepare,
311 .start_streaming = dt3155_start_streaming,
312 .stop_streaming = dt3155_stop_streaming, 306 .stop_streaming = dt3155_stop_streaming,
313 .buf_queue = dt3155_buf_queue, 307 .buf_queue = dt3155_buf_queue,
314}; 308};