diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-04-02 10:26:22 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:27 -0400 |
commit | 5325b4272a53b43f55b82cc369c310c2fcacdca1 (patch) | |
tree | f2a1491de3d05901152e0e271c0cb5ce381884c2 /drivers/media/video/au0828 | |
parent | c0ff29150d37615ac703802ab3edc775fd402491 (diff) |
V4L/DVB (11380): v4l2-subdev: change s_routing prototype
It is no longer needed to use a struct pointer as argument, since v4l2_subdev
doesn't require that ioctl-like approach anymore. Instead just pass the input,
output and config (new!) arguments directly.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/au0828')
-rw-r--r-- | drivers/media/video/au0828/au0828-video.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/video/au0828/au0828-video.c b/drivers/media/video/au0828/au0828-video.c index 19b23f21f968..27bedc6c7791 100644 --- a/drivers/media/video/au0828/au0828-video.c +++ b/drivers/media/video/au0828/au0828-video.c | |||
@@ -1154,7 +1154,6 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int index) | |||
1154 | struct au0828_fh *fh = priv; | 1154 | struct au0828_fh *fh = priv; |
1155 | struct au0828_dev *dev = fh->dev; | 1155 | struct au0828_dev *dev = fh->dev; |
1156 | int i; | 1156 | int i; |
1157 | struct v4l2_routing route; | ||
1158 | 1157 | ||
1159 | dprintk(1, "VIDIOC_S_INPUT in function %s, input=%d\n", __func__, | 1158 | dprintk(1, "VIDIOC_S_INPUT in function %s, input=%d\n", __func__, |
1160 | index); | 1159 | index); |
@@ -1180,9 +1179,8 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int index) | |||
1180 | break; | 1179 | break; |
1181 | } | 1180 | } |
1182 | 1181 | ||
1183 | route.input = AUVI_INPUT(index).vmux; | 1182 | v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_routing, |
1184 | route.output = 0; | 1183 | AUVI_INPUT(index).vmux, 0, 0); |
1185 | v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_routing, &route); | ||
1186 | 1184 | ||
1187 | for (i = 0; i < AU0828_MAX_INPUT; i++) { | 1185 | for (i = 0; i < AU0828_MAX_INPUT; i++) { |
1188 | int enable = 0; | 1186 | int enable = 0; |
@@ -1205,8 +1203,8 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int index) | |||
1205 | } | 1203 | } |
1206 | } | 1204 | } |
1207 | 1205 | ||
1208 | route.input = AUVI_INPUT(index).amux; | 1206 | v4l2_device_call_all(&dev->v4l2_dev, 0, audio, s_routing, |
1209 | v4l2_device_call_all(&dev->v4l2_dev, 0, audio, s_routing, &route); | 1207 | AUVI_INPUT(index).amux, 0, 0); |
1210 | return 0; | 1208 | return 0; |
1211 | } | 1209 | } |
1212 | 1210 | ||