diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-04-01 02:52:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:22 -0400 |
commit | f41737ece472cd803ffb24ac9f5d6fdd1d871341 (patch) | |
tree | 26ac526ec381e26c46a857f3ce44c84e75331b01 /drivers/media/video/cx25840 | |
parent | cc26b076cf8b1040ccc514302ef9a24042272ec3 (diff) |
V4L/DVB (11370): v4l2-subdev: move s_std from tuner to core.
s_std didn't belong in the tuner ops. Stricly speaking it should be part of
the video ops, but it is used by audio and tuner devices as well, so it is
more efficient to make it part of the core ops.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx25840')
-rw-r--r-- | drivers/media/video/cx25840/cx25840-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c index 51266812d338..62090279f46f 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c | |||
@@ -1472,6 +1472,7 @@ static const struct v4l2_subdev_core_ops cx25840_core_ops = { | |||
1472 | .g_ctrl = cx25840_g_ctrl, | 1472 | .g_ctrl = cx25840_g_ctrl, |
1473 | .s_ctrl = cx25840_s_ctrl, | 1473 | .s_ctrl = cx25840_s_ctrl, |
1474 | .queryctrl = cx25840_queryctrl, | 1474 | .queryctrl = cx25840_queryctrl, |
1475 | .s_std = cx25840_s_std, | ||
1475 | .reset = cx25840_reset, | 1476 | .reset = cx25840_reset, |
1476 | .load_fw = cx25840_load_fw, | 1477 | .load_fw = cx25840_load_fw, |
1477 | #ifdef CONFIG_VIDEO_ADV_DEBUG | 1478 | #ifdef CONFIG_VIDEO_ADV_DEBUG |
@@ -1482,7 +1483,6 @@ static const struct v4l2_subdev_core_ops cx25840_core_ops = { | |||
1482 | 1483 | ||
1483 | static const struct v4l2_subdev_tuner_ops cx25840_tuner_ops = { | 1484 | static const struct v4l2_subdev_tuner_ops cx25840_tuner_ops = { |
1484 | .s_frequency = cx25840_s_frequency, | 1485 | .s_frequency = cx25840_s_frequency, |
1485 | .s_std = cx25840_s_std, | ||
1486 | .s_radio = cx25840_s_radio, | 1486 | .s_radio = cx25840_s_radio, |
1487 | .g_tuner = cx25840_g_tuner, | 1487 | .g_tuner = cx25840_g_tuner, |
1488 | .s_tuner = cx25840_s_tuner, | 1488 | .s_tuner = cx25840_s_tuner, |