[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, 3 insertions, 7 deletions

diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c
index 8e2f79cb045e..82bf5679da30 100644
--- a/drivers/media/i2c/ir-kbd-i2c.c
+++ b/drivers/media/i2c/ir-kbd-i2c.c
@@ -295,7 +295,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
         unsigned short addr = client->addr;
         int err;
 
-        ir = kzalloc(sizeof(struct IR_i2c), GFP_KERNEL);
+        ir = devm_kzalloc(&client->dev, sizeof(*ir), GFP_KERNEL);
         if (!ir)
                 return -ENOMEM;
 
@@ -398,10 +398,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                  * internally
                  */
                 rc = rc_allocate_device();
-                if (!rc) {
-                        err = -ENOMEM;
-                        goto err_out_free;
-                }
+                if (!rc)
+                        return -ENOMEM;
         }
         ir->rc = rc;
 
@@ -454,7 +452,6 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
  err_out_free:
         /* Only frees rc if it were allocated internally */
         rc_free_device(rc);
-        kfree(ir);
         return err;
 }
 
@@ -470,7 +467,6 @@ static int ir_remove(struct i2c_client *client)
                 rc_unregister_device(ir->rc);
 
         /* free memory */
-        kfree(ir);
         return 0;
 }