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

struct soc_camera_link currently contains fields, used both by sensor and
bridge drivers. To make subdevice driver re-use simpler, split it into a
host and a subdevice parts.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/media/i2c/soc_camera/ov2640.c b/drivers/media/i2c/soc_camera/ov2640.c
index 66698a83bda2..c57a5095edef 100644
--- a/drivers/media/i2c/soc_camera/ov2640.c
+++ b/drivers/media/i2c/soc_camera/ov2640.c
@@ -771,9 +771,9 @@ static int ov2640_s_register(struct v4l2_subdev *sd,
 static int ov2640_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);
 }
 
 /* Select the nearest higher resolution for capture */
@@ -1046,13 +1046,13 @@ static int ov2640_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_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
                 V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
                 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;
 }
@@ -1080,11 +1080,11 @@ static int ov2640_probe(struct i2c_client *client,
                         const struct i2c_device_id *did)
 {
         struct ov2640_priv      *priv;
-        struct soc_camera_link  *icl = soc_camera_i2c_to_link(client);
+        struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
         struct i2c_adapter      *adapter = to_i2c_adapter(client->dev.parent);
         int                     ret;
 
-        if (!icl) {
+        if (!ssdd) {
                 dev_err(&adapter->dev,
                         "OV2640: Missing platform_data for driver\n");
                 return -EINVAL;