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

public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH v2] adv7343: use devm_kzalloc() instead of kzalloc()
@ 2013-01-04  5:11 Lad, Prabhakar
  2013-01-04  5:11 ` [PATCH v2] tvp514x: " Lad, Prabhakar
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Lad, Prabhakar @ 2013-01-04  5:11 UTC (permalink / raw)
  To: LMML
  Cc: LKML, Mauro Carvalho Chehab, Laurent Pinchart, Hans Verkuil,
	Lad, Prabhakar, Manjunath Hadli

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@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
---
 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;
 }
-- 
1.7.4.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH v2] tvp514x: use devm_kzalloc() instead of kzalloc()
  2013-01-04  5:11 [PATCH v2] adv7343: use devm_kzalloc() instead of kzalloc() Lad, Prabhakar
@ 2013-01-04  5:11 ` Lad, Prabhakar
  2013-01-04  5:11 ` [PATCH v2] tvp7002: " Lad, Prabhakar
  2013-01-04  6:19 ` [PATCH v2] adv7343: " Laurent Pinchart
  2 siblings, 0 replies; 4+ messages in thread
From: Lad, Prabhakar @ 2013-01-04  5:11 UTC (permalink / raw)
  To: LMML
  Cc: LKML, Mauro Carvalho Chehab, Laurent Pinchart, Hans Verkuil,
	Lad, Prabhakar, Manjunath Hadli

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@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
---
 Changes for v2:
 1: Fixed comments pointed out by Laurent.

 drivers/media/i2c/tvp514x.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c
index d5e1021..aa94ebc 100644
--- a/drivers/media/i2c/tvp514x.c
+++ b/drivers/media/i2c/tvp514x.c
@@ -951,7 +951,7 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id)
 		return -ENODEV;
 	}
 
-	decoder = kzalloc(sizeof(*decoder), GFP_KERNEL);
+	decoder = devm_kzalloc(&client->dev, sizeof(*decoder), GFP_KERNEL);
 	if (!decoder)
 		return -ENOMEM;
 
@@ -998,7 +998,6 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id)
 		int err = decoder->hdl.error;
 
 		v4l2_ctrl_handler_free(&decoder->hdl);
-		kfree(decoder);
 		return err;
 	}
 	v4l2_ctrl_handler_setup(&decoder->hdl);
@@ -1023,7 +1022,6 @@ static int tvp514x_remove(struct i2c_client *client)
 
 	v4l2_device_unregister_subdev(sd);
 	v4l2_ctrl_handler_free(&decoder->hdl);
-	kfree(decoder);
 	return 0;
 }
 /* TVP5146 Init/Power on Sequence */
-- 
1.7.4.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH v2] tvp7002: use devm_kzalloc() instead of kzalloc()
  2013-01-04  5:11 [PATCH v2] adv7343: use devm_kzalloc() instead of kzalloc() Lad, Prabhakar
  2013-01-04  5:11 ` [PATCH v2] tvp514x: " Lad, Prabhakar
@ 2013-01-04  5:11 ` Lad, Prabhakar
  2013-01-04  6:19 ` [PATCH v2] adv7343: " Laurent Pinchart
  2 siblings, 0 replies; 4+ messages in thread
From: Lad, Prabhakar @ 2013-01-04  5:11 UTC (permalink / raw)
  To: LMML
  Cc: LKML, Mauro Carvalho Chehab, Laurent Pinchart, Hans Verkuil,
	Lad, Prabhakar, Manjunath Hadli

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@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
---
 Changes for v2:
 1: Fixed comments pointed out by Laurent.

 drivers/media/i2c/tvp7002.c |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c
index fb6a5b5..537f6b4 100644
--- a/drivers/media/i2c/tvp7002.c
+++ b/drivers/media/i2c/tvp7002.c
@@ -1036,7 +1036,7 @@ static int tvp7002_probe(struct i2c_client *c, const struct i2c_device_id *id)
 		return -ENODEV;
 	}
 
-	device = kzalloc(sizeof(struct tvp7002), GFP_KERNEL);
+	device = devm_kzalloc(&c->dev, sizeof(struct tvp7002), GFP_KERNEL);
 
 	if (!device)
 		return -ENOMEM;
@@ -1052,7 +1052,7 @@ static int tvp7002_probe(struct i2c_client *c, const struct i2c_device_id *id)
 
 	error = tvp7002_read(sd, TVP7002_CHIP_REV, &revision);
 	if (error < 0)
-		goto found_error;
+		return error;
 
 	/* Get revision number */
 	v4l2_info(sd, "Rev. %02x detected.\n", revision);
@@ -1063,21 +1063,21 @@ static int tvp7002_probe(struct i2c_client *c, const struct i2c_device_id *id)
 	error = tvp7002_write_inittab(sd, tvp7002_init_default);
 
 	if (error < 0)
-		goto found_error;
+		return error;
 
 	/* Set polarity information after registers have been set */
 	polarity_a = 0x20 | device->pdata->hs_polarity << 5
 			| device->pdata->vs_polarity << 2;
 	error = tvp7002_write(sd, TVP7002_SYNC_CTL_1, polarity_a);
 	if (error < 0)
-		goto found_error;
+		return error;
 
 	polarity_b = 0x01  | device->pdata->fid_polarity << 2
 			| device->pdata->sog_polarity << 1
 			| device->pdata->clk_polarity;
 	error = tvp7002_write(sd, TVP7002_MISC_CTL_3, polarity_b);
 	if (error < 0)
-		goto found_error;
+		return error;
 
 	/* Set registers according to default video mode */
 	preset.preset = device->current_preset->preset;
@@ -1091,16 +1091,11 @@ static int tvp7002_probe(struct i2c_client *c, const struct i2c_device_id *id)
 		int err = device->hdl.error;
 
 		v4l2_ctrl_handler_free(&device->hdl);
-		kfree(device);
 		return err;
 	}
 	v4l2_ctrl_handler_setup(&device->hdl);
 
-found_error:
-	if (error < 0)
-		kfree(device);
-
-	return error;
+	return 0;
 }
 
 /*
@@ -1120,7 +1115,6 @@ static int tvp7002_remove(struct i2c_client *c)
 
 	v4l2_device_unregister_subdev(sd);
 	v4l2_ctrl_handler_free(&device->hdl);
-	kfree(device);
 	return 0;
 }
 
-- 
1.7.4.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH v2] adv7343: use devm_kzalloc() instead of kzalloc()
  2013-01-04  5:11 [PATCH v2] adv7343: use devm_kzalloc() instead of kzalloc() Lad, Prabhakar
  2013-01-04  5:11 ` [PATCH v2] tvp514x: " Lad, Prabhakar
  2013-01-04  5:11 ` [PATCH v2] tvp7002: " Lad, Prabhakar
@ 2013-01-04  6:19 ` Laurent Pinchart
  2 siblings, 0 replies; 4+ messages in thread
From: Laurent Pinchart @ 2013-01-04  6:19 UTC (permalink / raw)
  To: Lad, Prabhakar
  Cc: LMML, LKML, Mauro Carvalho Chehab, Hans Verkuil, Lad, Prabhakar,
	Manjunath Hadli

Hi Prabhakar,

Thank you for the patches.

For the whole set,

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

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@ti.com>
> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
> ---
>  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


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-01-04  6:17 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-04  5:11 [PATCH v2] adv7343: use devm_kzalloc() instead of kzalloc() Lad, Prabhakar
2013-01-04  5:11 ` [PATCH v2] tvp514x: " Lad, Prabhakar
2013-01-04  5:11 ` [PATCH v2] tvp7002: " Lad, Prabhakar
2013-01-04  6:19 ` [PATCH v2] adv7343: " Laurent Pinchart

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox