V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address

[safe/jmp/linux-2.6] / drivers / media / video / cx18 / cx18-gpio.c

diff --git a/drivers/media/video/cx18/cx18-gpio.c b/drivers/media/video/cx18/cx18-gpio.c
index dcc19b1..5374aeb 100644 (file)
--- a/drivers/media/video/cx18/cx18-gpio.c
+++ b/drivers/media/video/cx18/cx18-gpio.c
@@ -4,7 +4,7 @@
  *  Derived from ivtv-gpio.c
  *
  *  Copyright (C) 2007  Hans Verkuil <hverkuil@xs4all.nl>
- *  Copyright (C) 2008  Andy Walls <awalls@radix.net>
+ *  Copyright (C) 2008  Andy Walls <awalls@md.metrocast.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -110,8 +110,8 @@ static int gpiomux_log_status(struct v4l2_subdev *sd)
        struct cx18 *cx = v4l2_get_subdevdata(sd);
 
        mutex_lock(&cx->gpio_lock);
-       CX18_INFO("GPIO:  direction 0x%08x, value 0x%08x\n",
-               cx->gpio_dir, cx->gpio_val);
+       CX18_INFO_DEV(sd, "GPIO:  direction 0x%08x, value 0x%08x\n",
+                     cx->gpio_dir, cx->gpio_val);
        mutex_unlock(&cx->gpio_lock);
        return 0;
 }
@@ -156,12 +156,12 @@ static int gpiomux_s_std(struct v4l2_subdev *sd, v4l2_std_id norm)
 }
 
 static int gpiomux_s_audio_routing(struct v4l2_subdev *sd,
-                                  const struct v4l2_routing *route)
+                                  u32 input, u32 output, u32 config)
 {
        struct cx18 *cx = v4l2_get_subdevdata(sd);
        u32 data;
 
-       switch (route->input) {
+       switch (input) {
        case 0:
                data = cx->card->gpio_audio_input.tuner;
                break;
@@ -180,10 +180,10 @@ static int gpiomux_s_audio_routing(struct v4l2_subdev *sd,
 
 static const struct v4l2_subdev_core_ops gpiomux_core_ops = {
        .log_status = gpiomux_log_status,
+       .s_std = gpiomux_s_std,
 };
 
 static const struct v4l2_subdev_tuner_ops gpiomux_tuner_ops = {
-       .s_std = gpiomux_s_std,
        .s_radio = gpiomux_s_radio,
 };
 
@@ -205,8 +205,8 @@ static int resetctrl_log_status(struct v4l2_subdev *sd)
        struct cx18 *cx = v4l2_get_subdevdata(sd);
 
        mutex_lock(&cx->gpio_lock);
-       CX18_INFO("GPIO:  direction 0x%08x, value 0x%08x\n",
-               cx->gpio_dir, cx->gpio_val);
+       CX18_INFO_DEV(sd, "GPIO:  direction 0x%08x, value 0x%08x\n",
+                     cx->gpio_dir, cx->gpio_val);
        mutex_unlock(&cx->gpio_lock);
        return 0;
 }
@@ -297,12 +297,12 @@ int cx18_gpio_register(struct cx18 *cx, u32 hw)
        case CX18_HW_GPIO_MUX:
                sd = &cx->sd_gpiomux;
                ops = &gpiomux_ops;
-               str = "gpio mux";
+               str = "gpio-mux";
                break;
        case CX18_HW_GPIO_RESET_CTRL:
                sd = &cx->sd_resetctrl;
                ops = &resetctrl_ops;
-               str = "gpio reset ctrl";
+               str = "gpio-reset-ctrl";
                break;
        default:
                return -EINVAL;