[PATCH] adv7343: use devm_kzalloc() instead of kzalloc()

[Lad, Prabhakar]

I2C drivers can use devm_kzalloc() too in their .probe() methods. Doing so
simplifies their clean up paths.

Signed-off-by: Lad, Prabhakar <prabhakar....@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.ha...@ti.com>
---
 drivers/media/i2c/adv7343.c |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/media/i2c/adv7343.c b/drivers/media/i2c/adv7343.c
index 2b5aa67..ceaf548 100644
--- a/drivers/media/i2c/adv7343.c
+++ b/drivers/media/i2c/adv7343.c
@@ -397,7 +397,8 @@ static int adv7343_probe(struct i2c_client *client,
        v4l_info(client, "chip found @ 0x%x (%s)\n",
                        client->addr << 1, client->adapter->name);
 
-       state = kzalloc(sizeof(struct adv7343_state), GFP_KERNEL);
+       state = devm_kzalloc(&client->dev, sizeof(struct adv7343_state),
+                            GFP_KERNEL);
        if (state == NULL)
                return -ENOMEM;
 
@@ -428,19 +429,14 @@ static int adv7343_probe(struct i2c_client *client,
                                       ADV7343_GAIN_DEF);
        state->sd.ctrl_handler = &state->hdl;
        if (state->hdl.error) {
-               int err = state->hdl.error;
-
                v4l2_ctrl_handler_free(&state->hdl);
-               kfree(state);
-               return err;
+               return state->hdl.error;
        }
        v4l2_ctrl_handler_setup(&state->hdl);
 
        err = adv7343_initialize(&state->sd);
-       if (err) {
+       if (err)
                v4l2_ctrl_handler_free(&state->hdl);
-               kfree(state);
-       }
        return err;
 }
 
@@ -451,7 +447,6 @@ static int adv7343_remove(struct i2c_client *client)
 
        v4l2_device_unregister_subdev(sd);
        v4l2_ctrl_handler_free(&state->hdl);
-       kfree(state);
 
        return 0;
 }
-- 
1.7.4.1

_______________________________________________
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source