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/pvrusb2/pvrusb2-wm8775.c | |
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/pvrusb2/pvrusb2-wm8775.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-wm8775.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c index 1670aa4051ce..8c1eae05aa08 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c +++ b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c | |||
@@ -39,24 +39,22 @@ | |||
39 | void pvr2_wm8775_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) | 39 | void pvr2_wm8775_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) |
40 | { | 40 | { |
41 | if (hdw->input_dirty || hdw->force_dirty) { | 41 | if (hdw->input_dirty || hdw->force_dirty) { |
42 | struct v4l2_routing route; | 42 | u32 input; |
43 | |||
44 | memset(&route, 0, sizeof(route)); | ||
45 | 43 | ||
46 | switch (hdw->input_val) { | 44 | switch (hdw->input_val) { |
47 | case PVR2_CVAL_INPUT_RADIO: | 45 | case PVR2_CVAL_INPUT_RADIO: |
48 | route.input = 1; | 46 | input = 1; |
49 | break; | 47 | break; |
50 | default: | 48 | default: |
51 | /* All other cases just use the second input */ | 49 | /* All other cases just use the second input */ |
52 | route.input = 2; | 50 | input = 2; |
53 | break; | 51 | break; |
54 | } | 52 | } |
55 | pvr2_trace(PVR2_TRACE_CHIPS, "subdev wm8775" | 53 | pvr2_trace(PVR2_TRACE_CHIPS, "subdev wm8775" |
56 | " set_input(val=%d route=0x%x)", | 54 | " set_input(val=%d route=0x%x)", |
57 | hdw->input_val, route.input); | 55 | hdw->input_val, input); |
58 | 56 | ||
59 | sd->ops->audio->s_routing(sd, &route); | 57 | sd->ops->audio->s_routing(sd, input, 0, 0); |
60 | } | 58 | } |
61 | } | 59 | } |
62 | 60 | ||