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

From: Laurent Pinchart
Date: Fri Jan 04 2013 - 01:17:52 EST


Hi Prabhakar,

Thank you for the patches.

For the whole set,

Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>

On Friday 04 January 2013 10:41:15 Lad, Prabhakar wrote:
> I2C drivers can use devm_kzalloc() too in their .probe() methods. Doing so
> simplifies their clean up paths.
>
> Signed-off-by: Lad, Prabhakar <prabhakar.lad@xxxxxx>
> Signed-off-by: Manjunath Hadli <manjunath.hadli@xxxxxx>
> ---
> Changes for v2:
> 1: Fixed comments pointed out by Laurent.
>
> drivers/media/i2c/adv7343.c | 9 +++------
> 1 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/i2c/adv7343.c b/drivers/media/i2c/adv7343.c
> index 2b5aa67..432eb5f 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;
>
> @@ -431,16 +432,13 @@ static int adv7343_probe(struct i2c_client *client,
> int err = state->hdl.error;
>
> v4l2_ctrl_handler_free(&state->hdl);
> - kfree(state);
> return err;
> }
> 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 +449,6 @@ static int adv7343_remove(struct i2c_client *client)
>
> v4l2_device_unregister_subdev(sd);
> v4l2_ctrl_handler_free(&state->hdl);
> - kfree(state);
>
> return 0;
> }
--
Regards,

Laurent Pinchart

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/