The patch number 14803 was added via Douglas Schilling Landgraf
<[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Hans Verkuil <[email protected]>
v4l2-common: simplify prio utility functions
v4l2_prio_init/open/close returned an int when in fact they would
always return 0. Make these void functions.
v4l2_prio_close and v4l2_prio_check pass an enum v4l2_priority as a
pointer for no good reason. Replace with a normal enum v4l2_priority
argument.
These changes will simplify the work of moving priority handling into
the v4l core.
Priority: normal
Signed-off-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Douglas Schilling Landgraf <[email protected]>
---
linux/drivers/media/video/bt8xx/bttv-driver.c | 18 +++++-----
linux/drivers/media/video/cpia2/cpia2_v4l.c | 4 +-
linux/drivers/media/video/cx18/cx18-controls.c | 2 -
linux/drivers/media/video/cx18/cx18-fileops.c | 2 -
linux/drivers/media/video/cx18/cx18-ioctl.c | 16 ++++-----
linux/drivers/media/video/davinci/vpfe_capture.c | 2 -
linux/drivers/media/video/davinci/vpif_capture.c | 8 ++--
linux/drivers/media/video/davinci/vpif_display.c | 4 +-
linux/drivers/media/video/ivtv/ivtv-fileops.c | 2 -
linux/drivers/media/video/ivtv/ivtv-ioctl.c | 2 -
linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 +--
linux/drivers/media/video/saa7134/saa7134-video.c | 14 ++++----
linux/drivers/media/video/v4l2-common.c | 22 +++++--------
linux/drivers/staging/cx25821/cx25821-audups11.c | 6 +--
linux/drivers/staging/cx25821/cx25821-video.c | 10 ++---
linux/drivers/staging/cx25821/cx25821-video0.c | 6 +--
linux/drivers/staging/cx25821/cx25821-video1.c | 6 +--
linux/drivers/staging/cx25821/cx25821-video2.c | 6 +--
linux/drivers/staging/cx25821/cx25821-video3.c | 6 +--
linux/drivers/staging/cx25821/cx25821-video4.c | 6 +--
linux/drivers/staging/cx25821/cx25821-video5.c | 6 +--
linux/drivers/staging/cx25821/cx25821-video6.c | 6 +--
linux/drivers/staging/cx25821/cx25821-video7.c | 6 +--
linux/drivers/staging/cx25821/cx25821-videoioctl.c | 6 +--
linux/drivers/staging/cx25821/cx25821-vidups10.c | 6 +--
linux/drivers/staging/cx25821/cx25821-vidups9.c | 6 +--
linux/include/media/v4l2-common.h | 8 ++--
27 files changed, 94 insertions(+), 98 deletions(-)
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/media/video/bt8xx/bttv-driver.c
--- a/linux/drivers/media/video/bt8xx/bttv-driver.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/media/video/bt8xx/bttv-driver.c Wed May 12 15:26:35
2010 -0300
@@ -1552,7 +1552,7 @@
struct bttv_fh *fh = f;
struct bttv *btv = fh->btv;
- err = v4l2_prio_check(&btv->prio, &fh->prio);
+ err = v4l2_prio_check(&btv->prio, fh->prio);
if (0 != err)
return err;
@@ -1886,7 +1886,7 @@
unsigned int i;
int err;
- err = v4l2_prio_check(&btv->prio, &fh->prio);
+ err = v4l2_prio_check(&btv->prio, fh->prio);
if (0 != err)
return err;
@@ -1968,7 +1968,7 @@
int err;
- err = v4l2_prio_check(&btv->prio, &fh->prio);
+ err = v4l2_prio_check(&btv->prio, fh->prio);
if (0 != err)
return err;
@@ -1988,7 +1988,7 @@
struct bttv *btv = fh->btv;
int err;
- err = v4l2_prio_check(&btv->prio, &fh->prio);
+ err = v4l2_prio_check(&btv->prio, fh->prio);
if (0 != err)
return err;
@@ -2028,7 +2028,7 @@
struct bttv *btv = fh->btv;
int err;
- err = v4l2_prio_check(&btv->prio, &fh->prio);
+ err = v4l2_prio_check(&btv->prio, fh->prio);
if (0 != err)
return err;
@@ -3051,7 +3051,7 @@
crop->type != V4L2_BUF_TYPE_VIDEO_OVERLAY)
return -EINVAL;
- retval = v4l2_prio_check(&btv->prio, &fh->prio);
+ retval = v4l2_prio_check(&btv->prio, fh->prio);
if (0 != retval)
return retval;
@@ -3263,7 +3263,7 @@
*fh = btv->init;
fh->type = type;
fh->ov.setup_ok = 0;
- v4l2_prio_open(&btv->prio,&fh->prio);
+ v4l2_prio_open(&btv->prio, &fh->prio);
videobuf_queue_sg_init(&fh->cap, &bttv_video_qops,
&btv->c.pci->dev, &btv->s_lock,
@@ -3334,7 +3334,7 @@
/* free stuff */
videobuf_mmap_free(&fh->cap);
videobuf_mmap_free(&fh->vbi);
- v4l2_prio_close(&btv->prio,&fh->prio);
+ v4l2_prio_close(&btv->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
@@ -3471,7 +3471,7 @@
struct bttv *btv = fh->btv;
struct rds_command cmd;
- v4l2_prio_close(&btv->prio,&fh->prio);
+ v4l2_prio_close(&btv->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd linux/drivers/media/video/cpia2/cpia2_v4l.c
--- a/linux/drivers/media/video/cpia2/cpia2_v4l.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/media/video/cpia2/cpia2_v4l.c Wed May 12 15:26:35
2010 -0300
@@ -324,7 +324,7 @@
{
if(fh->mmapped)
cam->mmapped = 0;
- v4l2_prio_close(&cam->prio,&fh->prio);
+ v4l2_prio_close(&cam->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
}
@@ -1592,7 +1592,7 @@
case VIDIOC_S_FMT:
{
struct cpia2_fh *fh = file->private_data;
- retval = v4l2_prio_check(&cam->prio, &fh->prio);
+ retval = v4l2_prio_check(&cam->prio, fh->prio);
if(retval) {
mutex_unlock(&cam->busy_lock);
return retval;
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/media/video/cx18/cx18-controls.c
--- a/linux/drivers/media/video/cx18/cx18-controls.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/media/video/cx18/cx18-controls.c Wed May 12 15:26:35
2010 -0300
@@ -262,7 +262,7 @@
int ret;
struct v4l2_control ctrl;
- ret = v4l2_prio_check(&cx->prio, &id->prio);
+ ret = v4l2_prio_check(&cx->prio, id->prio);
if (ret)
return ret;
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/media/video/cx18/cx18-fileops.c
--- a/linux/drivers/media/video/cx18/cx18-fileops.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/media/video/cx18/cx18-fileops.c Wed May 12 15:26:35
2010 -0300
@@ -700,7 +700,7 @@
CX18_DEBUG_IOCTL("close() of %s\n", s->name);
- v4l2_prio_close(&cx->prio, &id->prio);
+ v4l2_prio_close(&cx->prio, id->prio);
/* Easy case first: this stream was never claimed by us */
if (s->id != id->open_id) {
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd linux/drivers/media/video/cx18/cx18-ioctl.c
--- a/linux/drivers/media/video/cx18/cx18-ioctl.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/media/video/cx18/cx18-ioctl.c Wed May 12 15:26:35
2010 -0300
@@ -277,7 +277,7 @@
int ret;
int w, h;
- ret = v4l2_prio_check(&cx->prio, &id->prio);
+ ret = v4l2_prio_check(&cx->prio, id->prio);
if (ret)
return ret;
@@ -306,7 +306,7 @@
struct cx18 *cx = id->cx;
int ret;
- ret = v4l2_prio_check(&cx->prio, &id->prio);
+ ret = v4l2_prio_check(&cx->prio, id->prio);
if (ret)
return ret;
@@ -341,7 +341,7 @@
int ret;
struct v4l2_sliced_vbi_format *vbifmt = &fmt->fmt.sliced;
- ret = v4l2_prio_check(&cx->prio, &id->prio);
+ ret = v4l2_prio_check(&cx->prio, id->prio);
if (ret)
return ret;
@@ -549,7 +549,7 @@
struct cx18 *cx = id->cx;
int ret;
- ret = v4l2_prio_check(&cx->prio, &id->prio);
+ ret = v4l2_prio_check(&cx->prio, id->prio);
if (ret)
return ret;
@@ -609,7 +609,7 @@
struct cx18 *cx = id->cx;
int ret;
- ret = v4l2_prio_check(&cx->prio, &id->prio);
+ ret = v4l2_prio_check(&cx->prio, id->prio);
if (ret)
return ret;
@@ -655,7 +655,7 @@
struct cx18 *cx = id->cx;
int ret;
- ret = v4l2_prio_check(&cx->prio, &id->prio);
+ ret = v4l2_prio_check(&cx->prio, id->prio);
if (ret)
return ret;
@@ -683,7 +683,7 @@
struct cx18 *cx = id->cx;
int ret;
- ret = v4l2_prio_check(&cx->prio, &id->prio);
+ ret = v4l2_prio_check(&cx->prio, id->prio);
if (ret)
return ret;
@@ -723,7 +723,7 @@
struct cx18 *cx = id->cx;
int ret;
- ret = v4l2_prio_check(&cx->prio, &id->prio);
+ ret = v4l2_prio_check(&cx->prio, id->prio);
if (ret)
return ret;
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/media/video/davinci/vpfe_capture.c
--- a/linux/drivers/media/video/davinci/vpfe_capture.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/media/video/davinci/vpfe_capture.c Wed May 12 15:26:35
2010 -0300
@@ -736,7 +736,7 @@
/* Decrement device usrs counter */
vpfe_dev->usrs--;
/* Close the priority */
- v4l2_prio_close(&vpfe_dev->prio, &fh->prio);
+ v4l2_prio_close(&vpfe_dev->prio, fh->prio);
/* If this is the last file handle */
if (!vpfe_dev->usrs) {
vpfe_dev->initialized = 0;
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/media/video/davinci/vpif_capture.c
--- a/linux/drivers/media/video/davinci/vpif_capture.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/media/video/davinci/vpif_capture.c Wed May 12 15:26:35
2010 -0300
@@ -868,7 +868,7 @@
mutex_unlock(&common->lock);
/* Close the priority */
- v4l2_prio_close(&ch->prio, &fh->prio);
+ v4l2_prio_close(&ch->prio, fh->prio);
if (fh->initialized)
ch->initialized = 0;
@@ -1443,7 +1443,7 @@
}
}
- ret = v4l2_prio_check(&ch->prio, &fh->prio);
+ ret = v4l2_prio_check(&ch->prio, fh->prio);
if (0 != ret)
return ret;
@@ -1553,7 +1553,7 @@
}
}
- ret = v4l2_prio_check(&ch->prio, &fh->prio);
+ ret = v4l2_prio_check(&ch->prio, fh->prio);
if (0 != ret)
return ret;
@@ -1709,7 +1709,7 @@
}
}
- ret = v4l2_prio_check(&ch->prio, &fh->prio);
+ ret = v4l2_prio_check(&ch->prio, fh->prio);
if (0 != ret)
return ret;
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/media/video/davinci/vpif_display.c
--- a/linux/drivers/media/video/davinci/vpif_display.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/media/video/davinci/vpif_display.c Wed May 12 15:26:35
2010 -0300
@@ -670,7 +670,7 @@
ch->initialized = 0;
/* Close the priority */
- v4l2_prio_close(&ch->prio, &fh->prio);
+ v4l2_prio_close(&ch->prio, fh->prio);
filep->private_data = NULL;
fh->initialized = 0;
kfree(fh);
@@ -752,7 +752,7 @@
}
/* Check for the priority */
- ret = v4l2_prio_check(&ch->prio, &fh->prio);
+ ret = v4l2_prio_check(&ch->prio, fh->prio);
if (0 != ret)
return ret;
fh->initialized = 1;
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/media/video/ivtv/ivtv-fileops.c
--- a/linux/drivers/media/video/ivtv/ivtv-fileops.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/media/video/ivtv/ivtv-fileops.c Wed May 12 15:26:35
2010 -0300
@@ -853,7 +853,7 @@
IVTV_DEBUG_FILE("close %s\n", s->name);
- v4l2_prio_close(&itv->prio, &id->prio);
+ v4l2_prio_close(&itv->prio, id->prio);
v4l2_fh_del(fh);
v4l2_fh_exit(fh);
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd linux/drivers/media/video/ivtv/ivtv-ioctl.c
--- a/linux/drivers/media/video/ivtv/ivtv-ioctl.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/media/video/ivtv/ivtv-ioctl.c Wed May 12 15:26:35
2010 -0300
@@ -1851,7 +1851,7 @@
case VIDIOC_S_EXT_CTRLS:
case VIDIOC_S_FBUF:
case VIDIOC_OVERLAY:
- ret = v4l2_prio_check(&itv->prio, &id->prio);
+ ret = v4l2_prio_check(&itv->prio, id->prio);
if (ret)
return ret;
}
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-v4l2.c Wed May 12 15:26:35
2010 -0300
@@ -183,7 +183,7 @@
case VIDIOC_S_INPUT:
case VIDIOC_S_TUNER:
case VIDIOC_S_FREQUENCY:
- ret = v4l2_prio_check(&vp->prio, &fh->prio);
+ ret = v4l2_prio_check(&vp->prio, fh->prio);
if (ret)
return ret;
}
@@ -976,7 +976,7 @@
fhp->rhp = NULL;
}
- v4l2_prio_close(&vp->prio, &fhp->prio);
+ v4l2_prio_close(&vp->prio, fhp->prio);
file->private_data = NULL;
if (fhp->vnext) {
@@ -1097,7 +1097,7 @@
fhp->file = file;
file->private_data = fhp;
- v4l2_prio_open(&vp->prio,&fhp->prio);
+ v4l2_prio_open(&vp->prio, &fhp->prio);
fhp->fw_mode_flag = pvr2_hdw_cpufw_get_enabled(hdw);
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/media/video/saa7134/saa7134-video.c
--- a/linux/drivers/media/video/saa7134/saa7134-video.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/media/video/saa7134/saa7134-video.c Wed May 12 15:26:35
2010 -0300
@@ -1180,7 +1180,7 @@
That needs to be fixed somehow, but for now this is
good enough. */
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -1359,7 +1359,7 @@
fh->fmt = format_by_fourcc(V4L2_PIX_FMT_BGR24);
fh->width = 720;
fh->height = 576;
- v4l2_prio_open(&dev->prio,&fh->prio);
+ v4l2_prio_open(&dev->prio, &fh->prio);
videobuf_queue_sg_init(&fh->cap, &video_qops,
&dev->pci->dev, &dev->slock,
@@ -1502,7 +1502,7 @@
saa7134_pgtable_free(dev->pci,&fh->pt_cap);
saa7134_pgtable_free(dev->pci,&fh->pt_vbi);
- v4l2_prio_close(&dev->prio,&fh->prio);
+ v4l2_prio_close(&dev->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
return 0;
@@ -1792,7 +1792,7 @@
struct saa7134_dev *dev = fh->dev;
int err;
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
@@ -1846,7 +1846,7 @@
That needs to be fixed somehow, but for now this is
good enough. */
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
} else if (res_locked(dev, RESOURCE_OVERLAY)) {
@@ -2030,7 +2030,7 @@
struct saa7134_dev *dev = fh->dev;
int rx, mode, err;
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
@@ -2064,7 +2064,7 @@
struct saa7134_dev *dev = fh->dev;
int err;
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd linux/drivers/media/video/v4l2-common.c
--- a/linux/drivers/media/video/v4l2-common.c Wed May 12 15:24:42 2010 -0300
+++ b/linux/drivers/media/video/v4l2-common.c Wed May 12 15:26:35 2010 -0300
@@ -89,10 +89,9 @@
val == V4L2_PRIORITY_INTERACTIVE || \
val == V4L2_PRIORITY_RECORD)
-int v4l2_prio_init(struct v4l2_prio_state *global)
+void v4l2_prio_init(struct v4l2_prio_state *global)
{
- memset(global,0,sizeof(*global));
- return 0;
+ memset(global, 0, sizeof(*global));
}
EXPORT_SYMBOL(v4l2_prio_init);
@@ -112,17 +111,16 @@
}
EXPORT_SYMBOL(v4l2_prio_change);
-int v4l2_prio_open(struct v4l2_prio_state *global, enum v4l2_priority *local)
+void v4l2_prio_open(struct v4l2_prio_state *global, enum v4l2_priority *local)
{
- return v4l2_prio_change(global,local,V4L2_PRIORITY_DEFAULT);
+ v4l2_prio_change(global, local, V4L2_PRIORITY_DEFAULT);
}
EXPORT_SYMBOL(v4l2_prio_open);
-int v4l2_prio_close(struct v4l2_prio_state *global, enum v4l2_priority *local)
+void v4l2_prio_close(struct v4l2_prio_state *global, enum v4l2_priority local)
{
- if (V4L2_PRIO_VALID(*local))
- atomic_dec(&global->prios[*local]);
- return 0;
+ if (V4L2_PRIO_VALID(local))
+ atomic_dec(&global->prios[local]);
}
EXPORT_SYMBOL(v4l2_prio_close);
@@ -138,11 +136,9 @@
}
EXPORT_SYMBOL(v4l2_prio_max);
-int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority *local)
+int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority local)
{
- if (*local < v4l2_prio_max(global))
- return -EBUSY;
- return 0;
+ return (local < v4l2_prio_max(global)) ? -EBUSY : 0;
}
EXPORT_SYMBOL(v4l2_prio_check);
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/staging/cx25821/cx25821-audups11.c
--- a/linux/drivers/staging/cx25821/cx25821-audups11.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/staging/cx25821/cx25821-audups11.c Wed May 12 15:26:35
2010 -0300
@@ -201,7 +201,7 @@
videobuf_mmap_free(&fh->vidq);
- v4l2_prio_close(&dev->prio, &fh->prio);
+ v4l2_prio_close(&dev->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
@@ -256,7 +256,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -347,7 +347,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/staging/cx25821/cx25821-video.c
--- a/linux/drivers/staging/cx25821/cx25821-video.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/staging/cx25821/cx25821-video.c Wed May 12 15:26:35
2010 -0300
@@ -846,7 +846,7 @@
dprintk(1, "%s()\n", __func__);
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -916,7 +916,7 @@
dprintk(1, "%s(%d)\n", __func__, i);
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -967,7 +967,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -1031,7 +1031,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -1239,7 +1239,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/staging/cx25821/cx25821-video0.c
--- a/linux/drivers/staging/cx25821/cx25821-video0.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/staging/cx25821/cx25821-video0.c Wed May 12 15:26:35
2010 -0300
@@ -219,7 +219,7 @@
videobuf_mmap_free(&fh->vidq);
- v4l2_prio_close(&dev->prio, &fh->prio);
+ v4l2_prio_close(&dev->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
@@ -274,7 +274,7 @@
int pix_format = PIXEL_FRMT_422;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -363,7 +363,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/staging/cx25821/cx25821-video1.c
--- a/linux/drivers/staging/cx25821/cx25821-video1.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/staging/cx25821/cx25821-video1.c Wed May 12 15:26:35
2010 -0300
@@ -219,7 +219,7 @@
videobuf_mmap_free(&fh->vidq);
- v4l2_prio_close(&dev->prio, &fh->prio);
+ v4l2_prio_close(&dev->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
@@ -274,7 +274,7 @@
int pix_format = 0;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -363,7 +363,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/staging/cx25821/cx25821-video2.c
--- a/linux/drivers/staging/cx25821/cx25821-video2.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/staging/cx25821/cx25821-video2.c Wed May 12 15:26:35
2010 -0300
@@ -219,7 +219,7 @@
videobuf_mmap_free(&fh->vidq);
- v4l2_prio_close(&dev->prio, &fh->prio);
+ v4l2_prio_close(&dev->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
@@ -274,7 +274,7 @@
int pix_format = 0;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -365,7 +365,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/staging/cx25821/cx25821-video3.c
--- a/linux/drivers/staging/cx25821/cx25821-video3.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/staging/cx25821/cx25821-video3.c Wed May 12 15:26:35
2010 -0300
@@ -219,7 +219,7 @@
videobuf_mmap_free(&fh->vidq);
- v4l2_prio_close(&dev->prio, &fh->prio);
+ v4l2_prio_close(&dev->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
@@ -274,7 +274,7 @@
int pix_format = 0;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -364,7 +364,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/staging/cx25821/cx25821-video4.c
--- a/linux/drivers/staging/cx25821/cx25821-video4.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/staging/cx25821/cx25821-video4.c Wed May 12 15:26:35
2010 -0300
@@ -218,7 +218,7 @@
videobuf_mmap_free(&fh->vidq);
- v4l2_prio_close(&dev->prio, &fh->prio);
+ v4l2_prio_close(&dev->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
@@ -274,7 +274,7 @@
// check priority
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -363,7 +363,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/staging/cx25821/cx25821-video5.c
--- a/linux/drivers/staging/cx25821/cx25821-video5.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/staging/cx25821/cx25821-video5.c Wed May 12 15:26:35
2010 -0300
@@ -219,7 +219,7 @@
videobuf_mmap_free(&fh->vidq);
- v4l2_prio_close(&dev->prio, &fh->prio);
+ v4l2_prio_close(&dev->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
@@ -274,7 +274,7 @@
int pix_format = 0;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -363,7 +363,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/staging/cx25821/cx25821-video6.c
--- a/linux/drivers/staging/cx25821/cx25821-video6.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/staging/cx25821/cx25821-video6.c Wed May 12 15:26:35
2010 -0300
@@ -218,7 +218,7 @@
videobuf_mmap_free(&fh->vidq);
- v4l2_prio_close(&dev->prio, &fh->prio);
+ v4l2_prio_close(&dev->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
@@ -273,7 +273,7 @@
int pix_format = 0;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -363,7 +363,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/staging/cx25821/cx25821-video7.c
--- a/linux/drivers/staging/cx25821/cx25821-video7.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/staging/cx25821/cx25821-video7.c Wed May 12 15:26:35
2010 -0300
@@ -218,7 +218,7 @@
videobuf_mmap_free(&fh->vidq);
- v4l2_prio_close(&dev->prio, &fh->prio);
+ v4l2_prio_close(&dev->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
@@ -273,7 +273,7 @@
int pix_format = 0;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -362,7 +362,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/staging/cx25821/cx25821-videoioctl.c
--- a/linux/drivers/staging/cx25821/cx25821-videoioctl.c Wed May 12
15:24:42 2010 -0300
+++ b/linux/drivers/staging/cx25821/cx25821-videoioctl.c Wed May 12
15:26:35 2010 -0300
@@ -201,7 +201,7 @@
videobuf_mmap_free(&fh->vidq);
- v4l2_prio_close(&dev->prio, &fh->prio);
+ v4l2_prio_close(&dev->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
@@ -256,7 +256,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -409,7 +409,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/staging/cx25821/cx25821-vidups10.c
--- a/linux/drivers/staging/cx25821/cx25821-vidups10.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/staging/cx25821/cx25821-vidups10.c Wed May 12 15:26:35
2010 -0300
@@ -201,7 +201,7 @@
videobuf_mmap_free(&fh->vidq);
- v4l2_prio_close(&dev->prio, &fh->prio);
+ v4l2_prio_close(&dev->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
@@ -299,7 +299,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -347,7 +347,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd
linux/drivers/staging/cx25821/cx25821-vidups9.c
--- a/linux/drivers/staging/cx25821/cx25821-vidups9.c Wed May 12 15:24:42
2010 -0300
+++ b/linux/drivers/staging/cx25821/cx25821-vidups9.c Wed May 12 15:26:35
2010 -0300
@@ -201,7 +201,7 @@
videobuf_mmap_free(&fh->vidq);
- v4l2_prio_close(&dev->prio, &fh->prio);
+ v4l2_prio_close(&dev->prio, fh->prio);
file->private_data = NULL;
kfree(fh);
@@ -299,7 +299,7 @@
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
@@ -345,7 +345,7 @@
struct cx25821_fh *fh = priv;
int err;
if (fh) {
- err = v4l2_prio_check(&dev->prio, &fh->prio);
+ err = v4l2_prio_check(&dev->prio, fh->prio);
if (0 != err)
return err;
}
diff -r 0f0ad10ca0b5 -r 1c0f7eccebbd linux/include/media/v4l2-common.h
--- a/linux/include/media/v4l2-common.h Wed May 12 15:24:42 2010 -0300
+++ b/linux/include/media/v4l2-common.h Wed May 12 15:26:35 2010 -0300
@@ -85,13 +85,13 @@
struct v4l2_prio_state {
atomic_t prios[4];
};
-int v4l2_prio_init(struct v4l2_prio_state *global);
+void v4l2_prio_init(struct v4l2_prio_state *global);
int v4l2_prio_change(struct v4l2_prio_state *global, enum v4l2_priority *local,
enum v4l2_priority new);
-int v4l2_prio_open(struct v4l2_prio_state *global, enum v4l2_priority *local);
-int v4l2_prio_close(struct v4l2_prio_state *global, enum v4l2_priority *local);
+void v4l2_prio_open(struct v4l2_prio_state *global, enum v4l2_priority *local);
+void v4l2_prio_close(struct v4l2_prio_state *global, enum v4l2_priority local);
enum v4l2_priority v4l2_prio_max(struct v4l2_prio_state *global);
-int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority *local);
+int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority local);
/* ------------------------------------------------------------------------- */
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/1c0f7eccebbdfc0b8d4709e61821d092ef182a6a
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
