Commit e276f7b5 authored by Trent Piepho's avatar Trent Piepho Committed by Mauro Carvalho Chehab

V4L/DVB (10848): zoran: Change first argument to zoran_v4l2_buffer_status

It was a struct file *, but all that function wants is the struct zoran_fh
from the file's private data.  Since every caller already has this, just
pass the zoran_fh instead.
Signed-off-by: default avatarTrent Piepho <xyzzy@speakeasy.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5a771cb1
...@@ -1377,11 +1377,10 @@ setup_overlay (struct file *file, ...@@ -1377,11 +1377,10 @@ setup_overlay (struct file *file,
/* get the status of a buffer in the clients buffer queue */ /* get the status of a buffer in the clients buffer queue */
static int static int
zoran_v4l2_buffer_status (struct file *file, zoran_v4l2_buffer_status (struct zoran_fh *fh,
struct v4l2_buffer *buf, struct v4l2_buffer *buf,
int num) int num)
{ {
struct zoran_fh *fh = file->private_data;
struct zoran *zr = fh->zr; struct zoran *zr = fh->zr;
buf->flags = V4L2_BUF_FLAG_MAPPED; buf->flags = V4L2_BUF_FLAG_MAPPED;
...@@ -2501,7 +2500,7 @@ static int zoran_querybuf(struct file *file, void *__fh, struct v4l2_buffer *buf ...@@ -2501,7 +2500,7 @@ static int zoran_querybuf(struct file *file, void *__fh, struct v4l2_buffer *buf
int res; int res;
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
res = zoran_v4l2_buffer_status(file, buf, buf->index); res = zoran_v4l2_buffer_status(fh, buf, buf->index);
mutex_unlock(&zr->resource_lock); mutex_unlock(&zr->resource_lock);
return res; return res;
...@@ -2602,7 +2601,7 @@ static int zoran_dqbuf(struct file *file, void *__fh, struct v4l2_buffer *buf) ...@@ -2602,7 +2601,7 @@ static int zoran_dqbuf(struct file *file, void *__fh, struct v4l2_buffer *buf)
if (res) if (res)
goto dqbuf_unlock_and_return; goto dqbuf_unlock_and_return;
zr->v4l_sync_tail++; zr->v4l_sync_tail++;
res = zoran_v4l2_buffer_status(file, buf, num); res = zoran_v4l2_buffer_status(fh, buf, num);
break; break;
case ZORAN_MAP_MODE_JPG_REC: case ZORAN_MAP_MODE_JPG_REC:
...@@ -2633,7 +2632,7 @@ static int zoran_dqbuf(struct file *file, void *__fh, struct v4l2_buffer *buf) ...@@ -2633,7 +2632,7 @@ static int zoran_dqbuf(struct file *file, void *__fh, struct v4l2_buffer *buf)
res = jpg_sync(file, &bs); res = jpg_sync(file, &bs);
if (res) if (res)
goto dqbuf_unlock_and_return; goto dqbuf_unlock_and_return;
res = zoran_v4l2_buffer_status(file, buf, bs.frame); res = zoran_v4l2_buffer_status(fh, buf, bs.frame);
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment