V4L/DVB: gscpa_sonixb: limit ov7630 max framerate at 640x480

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

diff --git a/drivers/media/video/m52790.c b/drivers/media/video/m52790.c
index de397ef..d7317e7 100644 (file)
--- a/drivers/media/video/m52790.c
+++ b/drivers/media/video/m52790.c
@@ -69,12 +69,13 @@ static int m52790_write(struct v4l2_subdev *sd)
    part of the audio output routing. The normal case is that another
    chip takes care of the actual muting so making it part of the
    output routing seems to be the right thing to do for now. */
-static int m52790_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int m52790_s_routing(struct v4l2_subdev *sd,
+                           u32 input, u32 output, u32 config)
 {
        struct m52790_state *state = to_state(sd);
 
-       state->input = route->input;
-       state->output = route->output;
+       state->input = input;
+       state->output = output;
        m52790_write(sd);
        return 0;
 }
@@ -132,11 +133,6 @@ static int m52790_log_status(struct v4l2_subdev *sd)
        return 0;
 }
 
-static int m52790_command(struct i2c_client *client, unsigned cmd, void *arg)
-{
-       return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
-}
-
 /* ----------------------------------------------------------------------- */
 
 static const struct v4l2_subdev_core_ops m52790_core_ops = {
@@ -210,8 +206,6 @@ MODULE_DEVICE_TABLE(i2c, m52790_id);
 
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "m52790",
-       .driverid = I2C_DRIVERID_M52790,
-       .command = m52790_command,
        .probe = m52790_probe,
        .remove = m52790_remove,
        .id_table = m52790_id,