[media] soc-camera: split struct soc_camera_link into host and subdevice parts

[mirror_ubuntu-artful-kernel.git] / drivers / media / i2c / soc_camera / ov6650.c

diff --git a/drivers/media/i2c/soc_camera/ov6650.c b/drivers/media/i2c/soc_camera/ov6650.c
index e87feb0881e391023e8a0143188207e234bdab2d..1ae8b8dd268b3e8c4344a7aba25e34b61b118395 100644 (file)
--- a/drivers/media/i2c/soc_camera/ov6650.c
+++ b/drivers/media/i2c/soc_camera/ov6650.c
@@ -435,9 +435,9 @@ static int ov6650_set_register(struct v4l2_subdev *sd,
 static int ov6650_s_power(struct v4l2_subdev *sd, int on)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-       struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+       struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
 
-       return soc_camera_set_power(&client->dev, icl, on);
+       return soc_camera_set_power(&client->dev, ssdd, on);
 }
 
 static int ov6650_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
@@ -892,7 +892,7 @@ static int ov6650_g_mbus_config(struct v4l2_subdev *sd,
                                struct v4l2_mbus_config *cfg)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-       struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+       struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
 
        cfg->flags = V4L2_MBUS_MASTER |
                V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING |
@@ -900,7 +900,7 @@ static int ov6650_g_mbus_config(struct v4l2_subdev *sd,
                V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW |
                V4L2_MBUS_DATA_ACTIVE_HIGH;
        cfg->type = V4L2_MBUS_PARALLEL;
-       cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+       cfg->flags = soc_camera_apply_board_flags(ssdd, cfg);
 
        return 0;
 }
@@ -910,8 +910,8 @@ static int ov6650_s_mbus_config(struct v4l2_subdev *sd,
                                const struct v4l2_mbus_config *cfg)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);
-       struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
-       unsigned long flags = soc_camera_apply_board_flags(icl, cfg);
+       struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
+       unsigned long flags = soc_camera_apply_board_flags(ssdd, cfg);
        int ret;
 
        if (flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
@@ -963,10 +963,10 @@ static int ov6650_probe(struct i2c_client *client,
                        const struct i2c_device_id *did)
 {
        struct ov6650 *priv;
-       struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+       struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
        int ret;
 
-       if (!icl) {
+       if (!ssdd) {
                dev_err(&client->dev, "Missing platform_data for driver\n");
                return -EINVAL;
        }