V4L/DVB (11380): v4l2-subdev: change s_routing prototype
[linux-2.6.git] / drivers / media / video / cx231xx / cx231xx-cards.c
index 79833c2..c8a32b1 100644 (file)
@@ -311,18 +311,18 @@ void cx231xx_card_setup(struct cx231xx *dev)
 
        /* request some modules */
        if (dev->board.decoder == CX231XX_AVDECODER) {
-               dev->sd_cx25840 =
-                       v4l2_i2c_new_subdev(&dev->i2c_bus[0].i2c_adap,
+               dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                                       &dev->i2c_bus[0].i2c_adap,
                                        "cx25840", "cx25840", 0x88 >> 1);
                if (dev->sd_cx25840 == NULL)
                        cx231xx_info("cx25840 subdev registration failure\n");
-               cx25840_call(dev, core, init, 0);
+               cx25840_call(dev, core, load_fw);
 
        }
 
        if (dev->board.tuner_type != TUNER_ABSENT) {
-               dev->sd_tuner =
-                       v4l2_i2c_new_subdev(&dev->i2c_bus[1].i2c_adap,
+               dev->sd_tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                               &dev->i2c_bus[1].i2c_adap,
                                "tuner", "tuner", 0xc2 >> 1);
                if (dev->sd_tuner == NULL)
                        cx231xx_info("tuner subdev registration failure\n");
@@ -357,10 +357,7 @@ int cx231xx_config(struct cx231xx *dev)
  */
 void cx231xx_config_i2c(struct cx231xx *dev)
 {
-       struct v4l2_routing route;
-
-       route.input = INPUT(dev->video_input)->vmux;
-       route.output = 0;
+       /* u32 input = INPUT(dev->video_input)->vmux; */
 
        call_all(dev, video, s_stream, 1);
 }