diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-gpio.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/media/video/ivtv/ivtv-gpio.c b/drivers/media/video/ivtv/ivtv-gpio.c index 85ac707228e7..aede061cae5d 100644 --- a/drivers/media/video/ivtv/ivtv-gpio.c +++ b/drivers/media/video/ivtv/ivtv-gpio.c | |||
@@ -236,18 +236,6 @@ static int subdev_s_radio(struct v4l2_subdev *sd) | |||
236 | return 0; | 236 | return 0; |
237 | } | 237 | } |
238 | 238 | ||
239 | static int subdev_s_std(struct v4l2_subdev *sd, v4l2_std_id std) | ||
240 | { | ||
241 | struct ivtv *itv = sd_to_ivtv(sd); | ||
242 | u16 mask, data; | ||
243 | |||
244 | mask = itv->card->gpio_audio_input.mask; | ||
245 | data = itv->card->gpio_audio_input.tuner; | ||
246 | if (mask) | ||
247 | write_reg((read_reg(IVTV_REG_GPIO_OUT) & ~mask) | (data & mask), IVTV_REG_GPIO_OUT); | ||
248 | return 0; | ||
249 | } | ||
250 | |||
251 | static int subdev_s_audio_routing(struct v4l2_subdev *sd, | 239 | static int subdev_s_audio_routing(struct v4l2_subdev *sd, |
252 | u32 input, u32 output, u32 config) | 240 | u32 input, u32 output, u32 config) |
253 | { | 241 | { |
@@ -344,7 +332,6 @@ static const struct v4l2_subdev_core_ops subdev_core_ops = { | |||
344 | .g_ctrl = subdev_g_ctrl, | 332 | .g_ctrl = subdev_g_ctrl, |
345 | .s_ctrl = subdev_s_ctrl, | 333 | .s_ctrl = subdev_s_ctrl, |
346 | .queryctrl = subdev_queryctrl, | 334 | .queryctrl = subdev_queryctrl, |
347 | .s_std = subdev_s_std, | ||
348 | }; | 335 | }; |
349 | 336 | ||
350 | static const struct v4l2_subdev_tuner_ops subdev_tuner_ops = { | 337 | static const struct v4l2_subdev_tuner_ops subdev_tuner_ops = { |