diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-05-01 07:03:24 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 11:58:54 -0400 |
commit | ffb4877ba013f94322083f77cbb05b35c2a218aa (patch) | |
tree | 0d041da73986e1dc7c845ff4418fb20f46bd7506 /drivers/media/video/davinci/vpif_capture.c | |
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/media/video/davinci/vpif_capture.c')
-rw-r--r-- | drivers/media/video/davinci/vpif_capture.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c index 2e5a7fb2d0c..a7f48b53d3f 100644 --- a/drivers/media/video/davinci/vpif_capture.c +++ b/drivers/media/video/davinci/vpif_capture.c | |||
@@ -869,7 +869,7 @@ static int vpif_release(struct file *filep) | |||
869 | mutex_unlock(&common->lock); | 869 | mutex_unlock(&common->lock); |
870 | 870 | ||
871 | /* Close the priority */ | 871 | /* Close the priority */ |
872 | v4l2_prio_close(&ch->prio, &fh->prio); | 872 | v4l2_prio_close(&ch->prio, fh->prio); |
873 | 873 | ||
874 | if (fh->initialized) | 874 | if (fh->initialized) |
875 | ch->initialized = 0; | 875 | ch->initialized = 0; |
@@ -1444,7 +1444,7 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id *std_id) | |||
1444 | } | 1444 | } |
1445 | } | 1445 | } |
1446 | 1446 | ||
1447 | ret = v4l2_prio_check(&ch->prio, &fh->prio); | 1447 | ret = v4l2_prio_check(&ch->prio, fh->prio); |
1448 | if (0 != ret) | 1448 | if (0 != ret) |
1449 | return ret; | 1449 | return ret; |
1450 | 1450 | ||
@@ -1554,7 +1554,7 @@ static int vpif_s_input(struct file *file, void *priv, unsigned int index) | |||
1554 | } | 1554 | } |
1555 | } | 1555 | } |
1556 | 1556 | ||
1557 | ret = v4l2_prio_check(&ch->prio, &fh->prio); | 1557 | ret = v4l2_prio_check(&ch->prio, fh->prio); |
1558 | if (0 != ret) | 1558 | if (0 != ret) |
1559 | return ret; | 1559 | return ret; |
1560 | 1560 | ||
@@ -1710,7 +1710,7 @@ static int vpif_s_fmt_vid_cap(struct file *file, void *priv, | |||
1710 | } | 1710 | } |
1711 | } | 1711 | } |
1712 | 1712 | ||
1713 | ret = v4l2_prio_check(&ch->prio, &fh->prio); | 1713 | ret = v4l2_prio_check(&ch->prio, fh->prio); |
1714 | if (0 != ret) | 1714 | if (0 != ret) |
1715 | return ret; | 1715 | return ret; |
1716 | 1716 | ||