diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2014-04-28 15:53:01 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-24 16:11:26 -0400 |
commit | 8774bed9ce832d8d9ccb79e92800b808aa2d2ad2 (patch) | |
tree | 30756d116a47317fff754ca0f976cf5134033756 /drivers/media/i2c/tvaudio.c | |
parent | 85ada737b9d9ede7dbb17e831d3b4bb187dc1915 (diff) |
[media] v4l: subdev: Move [gs]_std operation to video ops
The g_std and s_std operations are video-related, move them to the video
ops where they belong.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/i2c/tvaudio.c')
-rw-r--r-- | drivers/media/i2c/tvaudio.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/i2c/tvaudio.c b/drivers/media/i2c/tvaudio.c index d76c53a8f027..070c152da95a 100644 --- a/drivers/media/i2c/tvaudio.c +++ b/drivers/media/i2c/tvaudio.c | |||
@@ -1862,7 +1862,6 @@ static const struct v4l2_subdev_core_ops tvaudio_core_ops = { | |||
1862 | .s_ctrl = v4l2_subdev_s_ctrl, | 1862 | .s_ctrl = v4l2_subdev_s_ctrl, |
1863 | .queryctrl = v4l2_subdev_queryctrl, | 1863 | .queryctrl = v4l2_subdev_queryctrl, |
1864 | .querymenu = v4l2_subdev_querymenu, | 1864 | .querymenu = v4l2_subdev_querymenu, |
1865 | .s_std = tvaudio_s_std, | ||
1866 | }; | 1865 | }; |
1867 | 1866 | ||
1868 | static const struct v4l2_subdev_tuner_ops tvaudio_tuner_ops = { | 1867 | static const struct v4l2_subdev_tuner_ops tvaudio_tuner_ops = { |
@@ -1876,10 +1875,15 @@ static const struct v4l2_subdev_audio_ops tvaudio_audio_ops = { | |||
1876 | .s_routing = tvaudio_s_routing, | 1875 | .s_routing = tvaudio_s_routing, |
1877 | }; | 1876 | }; |
1878 | 1877 | ||
1878 | static const struct v4l2_subdev_video_ops tvaudio_video_ops = { | ||
1879 | .s_std = tvaudio_s_std, | ||
1880 | }; | ||
1881 | |||
1879 | static const struct v4l2_subdev_ops tvaudio_ops = { | 1882 | static const struct v4l2_subdev_ops tvaudio_ops = { |
1880 | .core = &tvaudio_core_ops, | 1883 | .core = &tvaudio_core_ops, |
1881 | .tuner = &tvaudio_tuner_ops, | 1884 | .tuner = &tvaudio_tuner_ops, |
1882 | .audio = &tvaudio_audio_ops, | 1885 | .audio = &tvaudio_audio_ops, |
1886 | .video = &tvaudio_video_ops, | ||
1883 | }; | 1887 | }; |
1884 | 1888 | ||
1885 | /* ----------------------------------------------------------------------- */ | 1889 | /* ----------------------------------------------------------------------- */ |