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/tvaudio.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/tvaudio.c')
-rw-r--r-- | drivers/media/video/tvaudio.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index 17d50e3cd518..0869bafc2b56 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c | |||
@@ -1781,17 +1781,18 @@ static int tvaudio_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) | |||
1781 | return -EINVAL; | 1781 | return -EINVAL; |
1782 | } | 1782 | } |
1783 | 1783 | ||
1784 | static int tvaudio_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *rt) | 1784 | static int tvaudio_s_routing(struct v4l2_subdev *sd, |
1785 | u32 input, u32 output, u32 config) | ||
1785 | { | 1786 | { |
1786 | struct CHIPSTATE *chip = to_state(sd); | 1787 | struct CHIPSTATE *chip = to_state(sd); |
1787 | struct CHIPDESC *desc = chip->desc; | 1788 | struct CHIPDESC *desc = chip->desc; |
1788 | 1789 | ||
1789 | if (!(desc->flags & CHIP_HAS_INPUTSEL)) | 1790 | if (!(desc->flags & CHIP_HAS_INPUTSEL)) |
1790 | return 0; | 1791 | return 0; |
1791 | if (rt->input >= 4) | 1792 | if (input >= 4) |
1792 | return -EINVAL; | 1793 | return -EINVAL; |
1793 | /* There are four inputs: tuner, radio, extern and intern. */ | 1794 | /* There are four inputs: tuner, radio, extern and intern. */ |
1794 | chip->input = rt->input; | 1795 | chip->input = input; |
1795 | if (chip->muted) | 1796 | if (chip->muted) |
1796 | return 0; | 1797 | return 0; |
1797 | chip_write_masked(chip, desc->inputreg, | 1798 | chip_write_masked(chip, desc->inputreg, |