diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-05-01 08:03:24 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 12:58:54 -0300 |
commit | ffb4877ba013f94322083f77cbb05b35c2a218aa (patch) | |
tree | 0d041da73986e1dc7c845ff4418fb20f46bd7506 /drivers/staging/cx25821 | |
parent | 530d2d32068eaf3616e0ce9e58a5fde5701c3380 (diff) |
V4L/DVB: 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.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/cx25821')
-rw-r--r-- | drivers/staging/cx25821/cx25821-audups11.c | 6 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-video.c | 11 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-video0.c | 6 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-video1.c | 6 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-video2.c | 6 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-video3.c | 6 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-video4.c | 6 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-video5.c | 6 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-video6.c | 6 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-video7.c | 6 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-videoioctl.c | 6 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-vidups10.c | 6 | ||||
-rw-r--r-- | drivers/staging/cx25821/cx25821-vidups9.c | 6 |
13 files changed, 41 insertions, 42 deletions
diff --git a/drivers/staging/cx25821/cx25821-audups11.c b/drivers/staging/cx25821/cx25821-audups11.c index 9193a6eb7cf2..e49ead982f39 100644 --- a/drivers/staging/cx25821/cx25821-audups11.c +++ b/drivers/staging/cx25821/cx25821-audups11.c @@ -203,7 +203,7 @@ static int video_release(struct file *file) 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); @@ -258,7 +258,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *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; } @@ -350,7 +350,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv, if (fh) { dev = fh->dev; - err = v4l2_prio_check(&dev->prio, &fh->prio); + err = v4l2_prio_check(&dev->prio, fh->prio); if (0 != err) return err; } diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/staging/cx25821/cx25821-video.c index a3bea2739cef..791212c1a661 100644 --- a/drivers/staging/cx25821/cx25821-video.c +++ b/drivers/staging/cx25821/cx25821-video.c @@ -846,7 +846,7 @@ int cx25821_vidioc_s_std(struct file *file, void *priv, v4l2_std_id * tvnorms) 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 @@ int cx25821_vidioc_s_input(struct file *file, void *priv, unsigned int i) 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,8 +967,7 @@ int cx25821_vidioc_s_frequency(struct file *file, void *priv, struct v4l2_freque int err; if (fh) { - dev = fh->dev; - err = v4l2_prio_check(&dev->prio, &fh->prio); + err = v4l2_prio_check(&dev->prio, fh->prio); if (0 != err) return err; } @@ -1032,7 +1031,7 @@ int cx25821_vidioc_s_tuner(struct file *file, void *priv, struct v4l2_tuner *t) 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; } @@ -1240,7 +1239,7 @@ int cx25821_vidioc_s_crop(struct file *file, void *priv, struct v4l2_crop *crop) 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 --git a/drivers/staging/cx25821/cx25821-video0.c b/drivers/staging/cx25821/cx25821-video0.c index 1f95ddba8499..0be2cc15d856 100644 --- a/drivers/staging/cx25821/cx25821-video0.c +++ b/drivers/staging/cx25821/cx25821-video0.c @@ -219,7 +219,7 @@ static int video_release(struct file *file) 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 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, 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 @@ static int vidioc_s_ctrl(struct file *file, void *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 --git a/drivers/staging/cx25821/cx25821-video1.c b/drivers/staging/cx25821/cx25821-video1.c index 9b94462a62cf..b0bae627bfb1 100644 --- a/drivers/staging/cx25821/cx25821-video1.c +++ b/drivers/staging/cx25821/cx25821-video1.c @@ -219,7 +219,7 @@ static int video_release(struct file *file) 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 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, 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 @@ static int vidioc_s_ctrl(struct file *file, void *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 --git a/drivers/staging/cx25821/cx25821-video2.c b/drivers/staging/cx25821/cx25821-video2.c index 31c46aa2e563..400cdb80674e 100644 --- a/drivers/staging/cx25821/cx25821-video2.c +++ b/drivers/staging/cx25821/cx25821-video2.c @@ -219,7 +219,7 @@ static int video_release(struct file *file) 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 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, 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 @@ static int vidioc_s_ctrl(struct file *file, void *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 --git a/drivers/staging/cx25821/cx25821-video3.c b/drivers/staging/cx25821/cx25821-video3.c index cbc5cad24a08..3b216ed0906e 100644 --- a/drivers/staging/cx25821/cx25821-video3.c +++ b/drivers/staging/cx25821/cx25821-video3.c @@ -219,7 +219,7 @@ static int video_release(struct file *file) 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 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, 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 @@ static int vidioc_s_ctrl(struct file *file, void *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 --git a/drivers/staging/cx25821/cx25821-video4.c b/drivers/staging/cx25821/cx25821-video4.c index 101074ad742c..f7b08c51868a 100644 --- a/drivers/staging/cx25821/cx25821-video4.c +++ b/drivers/staging/cx25821/cx25821-video4.c @@ -218,7 +218,7 @@ static int video_release(struct file *file) 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 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, // 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 @@ static int vidioc_s_ctrl(struct file *file, void *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 --git a/drivers/staging/cx25821/cx25821-video5.c b/drivers/staging/cx25821/cx25821-video5.c index 2019c5e3ea14..59370337b076 100644 --- a/drivers/staging/cx25821/cx25821-video5.c +++ b/drivers/staging/cx25821/cx25821-video5.c @@ -219,7 +219,7 @@ static int video_release(struct file *file) 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 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, 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 @@ static int vidioc_s_ctrl(struct file *file, void *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 --git a/drivers/staging/cx25821/cx25821-video6.c b/drivers/staging/cx25821/cx25821-video6.c index d19c786e5a5f..4db2eb83d35a 100644 --- a/drivers/staging/cx25821/cx25821-video6.c +++ b/drivers/staging/cx25821/cx25821-video6.c @@ -218,7 +218,7 @@ static int video_release(struct file *file) 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 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, 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 @@ static int vidioc_s_ctrl(struct file *file, void *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 --git a/drivers/staging/cx25821/cx25821-video7.c b/drivers/staging/cx25821/cx25821-video7.c index 8a7c854a0fc8..5e4a769badad 100644 --- a/drivers/staging/cx25821/cx25821-video7.c +++ b/drivers/staging/cx25821/cx25821-video7.c @@ -218,7 +218,7 @@ static int video_release(struct file *file) 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 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, 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 @@ static int vidioc_s_ctrl(struct file *file, void *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 --git a/drivers/staging/cx25821/cx25821-videoioctl.c b/drivers/staging/cx25821/cx25821-videoioctl.c index 840714a9415f..d16807d88be0 100644 --- a/drivers/staging/cx25821/cx25821-videoioctl.c +++ b/drivers/staging/cx25821/cx25821-videoioctl.c @@ -201,7 +201,7 @@ static int video_release(struct file *file) 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 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *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; } @@ -409,7 +409,7 @@ static int vidioc_s_ctrl(struct file *file, void *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 --git a/drivers/staging/cx25821/cx25821-vidups10.c b/drivers/staging/cx25821/cx25821-vidups10.c index 89c8592e5f02..c746a17ccbd2 100644 --- a/drivers/staging/cx25821/cx25821-vidups10.c +++ b/drivers/staging/cx25821/cx25821-vidups10.c @@ -201,7 +201,7 @@ static int video_release(struct file *file) 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 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *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; } @@ -347,7 +347,7 @@ static int vidioc_s_ctrl(struct file *file, void *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 --git a/drivers/staging/cx25821/cx25821-vidups9.c b/drivers/staging/cx25821/cx25821-vidups9.c index c8e8083c7934..466e0f34ae34 100644 --- a/drivers/staging/cx25821/cx25821-vidups9.c +++ b/drivers/staging/cx25821/cx25821-vidups9.c @@ -201,7 +201,7 @@ static int video_release(struct file *file) 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 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *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; } @@ -345,7 +345,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv, 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; } |