[media] media: i2c: Convert to devm_kzalloc()

Using the managed function the kfree() calls can be removed from the
probe error path and the remove handler.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/media/i2c/vs6624.c b/drivers/media/i2c/vs6624.c
index 6b8c0b7aa488..94e284908f39 100644
--- a/drivers/media/i2c/vs6624.c
+++ b/drivers/media/i2c/vs6624.c
@@ -813,11 +813,9 @@ static int vs6624_probe(struct i2c_client *client,
         /* wait 100ms before any further i2c writes are performed */
         mdelay(100);
 
-        sensor = kzalloc(sizeof(*sensor), GFP_KERNEL);
-        if (sensor == NULL) {
-                gpio_free(*ce);
+        sensor = devm_kzalloc(&client->dev, sizeof(*sensor), GFP_KERNEL);
+        if (sensor == NULL)
                 return -ENOMEM;
-        }
 
         sd = &sensor->sd;
         v4l2_i2c_subdev_init(sd, client, &vs6624_ops);
@@ -865,7 +863,6 @@ static int vs6624_probe(struct i2c_client *client,
                 int err = hdl->error;
 
                 v4l2_ctrl_handler_free(hdl);
-                kfree(sensor);
                 gpio_free(*ce);
                 return err;
         }
@@ -874,7 +871,6 @@ static int vs6624_probe(struct i2c_client *client,
         ret = v4l2_ctrl_handler_setup(hdl);
         if (ret) {
                 v4l2_ctrl_handler_free(hdl);
-                kfree(sensor);
                 gpio_free(*ce);
         }
         return ret;
@@ -888,7 +884,6 @@ static int vs6624_remove(struct i2c_client *client)
         v4l2_device_unregister_subdev(sd);
         v4l2_ctrl_handler_free(sd->ctrl_handler);
         gpio_free(sensor->ce_pin);
-        kfree(sensor);
         return 0;
 }