[PATCH 08/13] backlight: lms283gf05: use devm_ functions

[PATCH 08/13] backlight: lms283gf05: use devm_ functions

[Jingoo Han]

The devm_ functions allocate memory that is released when a driver
detaches. This patch uses devm_kzalloc of these functions.

Cc: Marek Vasut <marex@denx.de>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/video/backlight/lms283gf05.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/video/backlight/lms283gf05.c b/drivers/video/backlight/lms283gf05.c
index 4161f9e..a9f2c36 100644
--- a/drivers/video/backlight/lms283gf05.c
+++ b/drivers/video/backlight/lms283gf05.c
@@ -168,7 +168,8 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)
 			goto err;
 	}
 
-	st = kzalloc(sizeof(struct lms283gf05_state), GFP_KERNEL);
+	st = devm_kzalloc(&spi->dev, sizeof(struct lms283gf05_state),
+				GFP_KERNEL);
 	if (st == NULL) {
 		dev_err(&spi->dev, "No memory for device state\n");
 		ret = -ENOMEM;
@@ -178,7 +179,7 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)
 	ld = lcd_device_register("lms283gf05", &spi->dev, st, &lms_ops);
 	if (IS_ERR(ld)) {
 		ret = PTR_ERR(ld);
-		goto err2;
+		goto err;
 	}
 
 	st->spi = spi;
@@ -193,8 +194,6 @@ static int __devinit lms283gf05_probe(struct spi_device *spi)
 
 	return 0;
 
-err2:
-	kfree(st);
 err:
 	if (pdata != NULL)
 		gpio_free(pdata->reset_gpio);
@@ -212,8 +211,6 @@ static int __devexit lms283gf05_remove(struct spi_device *spi)
 	if (pdata != NULL)
 		gpio_free(pdata->reset_gpio);
 
-	kfree(st);
-
 	return 0;
 }
 
-- 
1.7.1

Re: [PATCH 08/13] backlight: lms283gf05: use devm_ functions

[Marek Vasut]

Dear Jingoo Han,

> The devm_ functions allocate memory that is released when a driver
> detaches. This patch uses devm_kzalloc of these functions.
> 
> Cc: Marek Vasut <marex@denx.de>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>

Acked-by: Marek Vasut <marek.vasut@gmail.com>

> ---
>  drivers/video/backlight/lms283gf05.c |    9 +++------
>  1 files changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/video/backlight/lms283gf05.c
> b/drivers/video/backlight/lms283gf05.c index 4161f9e..a9f2c36 100644
> --- a/drivers/video/backlight/lms283gf05.c
> +++ b/drivers/video/backlight/lms283gf05.c
> @@ -168,7 +168,8 @@ static int __devinit lms283gf05_probe(struct spi_device
> *spi) goto err;
>  	}
> 
> -	st = kzalloc(sizeof(struct lms283gf05_state), GFP_KERNEL);
> +	st = devm_kzalloc(&spi->dev, sizeof(struct lms283gf05_state),
> +				GFP_KERNEL);
>  	if (st == NULL) {
>  		dev_err(&spi->dev, "No memory for device state\n");
>  		ret = -ENOMEM;
> @@ -178,7 +179,7 @@ static int __devinit lms283gf05_probe(struct spi_device
> *spi) ld = lcd_device_register("lms283gf05", &spi->dev, st, &lms_ops); if
> (IS_ERR(ld)) {
>  		ret = PTR_ERR(ld);
> -		goto err2;
> +		goto err;
>  	}
> 
>  	st->spi = spi;
> @@ -193,8 +194,6 @@ static int __devinit lms283gf05_probe(struct spi_device
> *spi)
> 
>  	return 0;
> 
> -err2:
> -	kfree(st);
>  err:
>  	if (pdata != NULL)
>  		gpio_free(pdata->reset_gpio);
> @@ -212,8 +211,6 @@ static int __devexit lms283gf05_remove(struct
> spi_device *spi) if (pdata != NULL)
>  		gpio_free(pdata->reset_gpio);
> 
> -	kfree(st);
> -
>  	return 0;
>  }

Best regards,
Marek Vasut