diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-21 22:47:24 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-21 22:47:24 +0100 |
| commit | ceb38ab7b287651e30d049e86e6469d4bcc3ea3b (patch) | |
| tree | 117224f2cd44c28327d28f55bd0153dd7e99752d /linux/drivers/media/video/cx25840 | |
| parent | c0d72775f8fc3a3e551f233b3501ccf1ca23fe2a (diff) | |
| download | mediapointer-dvb-s2-ceb38ab7b287651e30d049e86e6469d4bcc3ea3b.tar.gz mediapointer-dvb-s2-ceb38ab7b287651e30d049e86e6469d4bcc3ea3b.tar.bz2 | |
v4l2-common: remove v4l2_ctrl_query_fill_std
From: Hans Verkuil <hverkuil@xs4all.nl>
The v4l2_ctrl_query_fill_std() function wasn't one the best idea I ever had.
It doesn't add anything valuable that cannot be expressed equally well with
v4l2_ctrl_query_fill and only adds overhead.
Replace it with v4l2_ctrl_query_fill() everywhere it is used and remove it
from v4l2_common.c.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx25840')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-core.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c index d70dcd028..921cc96fc 100644 --- a/linux/drivers/media/video/cx25840/cx25840-core.c +++ b/linux/drivers/media/video/cx25840/cx25840-core.c @@ -1224,10 +1224,12 @@ static int cx25840_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) switch (qc->id) { case V4L2_CID_BRIGHTNESS: + return v4l2_ctrl_query_fill(qc, 0, 255, 1, 128); case V4L2_CID_CONTRAST: case V4L2_CID_SATURATION: + return v4l2_ctrl_query_fill(qc, 0, 127, 1, 64); case V4L2_CID_HUE: - return v4l2_ctrl_query_fill_std(qc); + return v4l2_ctrl_query_fill(qc, -128, 127, 1, 0); default: break; } @@ -1239,10 +1241,11 @@ static int cx25840_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, state->default_volume); case V4L2_CID_AUDIO_MUTE: + return v4l2_ctrl_query_fill(qc, 0, 1, 1, 0); case V4L2_CID_AUDIO_BALANCE: case V4L2_CID_AUDIO_BASS: case V4L2_CID_AUDIO_TREBLE: - return v4l2_ctrl_query_fill_std(qc); + return v4l2_ctrl_query_fill(qc, 0, 65535, 65535 / 100, 32768); default: return -EINVAL; } |