1 files changed, 14 insertions, 22 deletions

diff --git a/drivers/media/i2c/soc_camera/ov772x.c b/drivers/media/i2c/soc_camera/ov772x.c
index e4a10751894d..fbeb5b2f3ae5 100644
--- a/drivers/media/i2c/soc_camera/ov772x.c
+++ b/drivers/media/i2c/soc_camera/ov772x.c
@@ -667,9 +667,9 @@ static int ov772x_s_register(struct v4l2_subdev *sd,
 static int ov772x_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 const struct ov772x_win_size *ov772x_select_win(u32 width, u32 height)
@@ -1019,13 +1019,13 @@ static int ov772x_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;
 }
@@ -1054,11 +1054,11 @@ static int ov772x_probe(struct i2c_client *client,
                         const struct i2c_device_id *did)
 {
         struct ov772x_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 || !icl->priv) {
+        if (!ssdd || !ssdd->drv_priv) {
                 dev_err(&client->dev, "OV772X: missing platform data!\n");
                 return -EINVAL;
         }
@@ -1070,11 +1070,11 @@ static int ov772x_probe(struct i2c_client *client,
                 return -EIO;
         }
 
-        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        priv = devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL);
         if (!priv)
                 return -ENOMEM;
 
-        priv->info = icl->priv;
+        priv->info = ssdd->drv_priv;
 
         v4l2_i2c_subdev_init(&priv->subdev, client, &ov772x_subdev_ops);
         v4l2_ctrl_handler_init(&priv->hdl, 3);
@@ -1085,22 +1085,15 @@ static int ov772x_probe(struct i2c_client *client,
         v4l2_ctrl_new_std(&priv->hdl, &ov772x_ctrl_ops,
                         V4L2_CID_BAND_STOP_FILTER, 0, 256, 1, 0);
         priv->subdev.ctrl_handler = &priv->hdl;
-        if (priv->hdl.error) {
-                ret = priv->hdl.error;
-                goto done;
-        }
+        if (priv->hdl.error)
+                return priv->hdl.error;
 
         ret = ov772x_video_probe(priv);
-        if (ret < 0)
-                goto done;
-
-        priv->cfmt = &ov772x_cfmts[0];
-        priv->win = &ov772x_win_sizes[0];
-
-done:
-        if (ret) {
+        if (ret < 0) {
                 v4l2_ctrl_handler_free(&priv->hdl);
-                kfree(priv);
+        } else {
+                priv->cfmt = &ov772x_cfmts[0];
+                priv->win = &ov772x_win_sizes[0];
         }
         return ret;
 }
@@ -1111,7 +1104,6 @@ static int ov772x_remove(struct i2c_client *client)
 
         v4l2_device_unregister_subdev(&priv->subdev);
         v4l2_ctrl_handler_free(&priv->hdl);
-        kfree(priv);
         return 0;
 }