2012-06-11 00:11:17

by Jingoo Han

Subject: [PATCH v2 2/3][RESEND] backlight: ot200_bl: use devm_ functions

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

Cc: Christian Gmeiner <[email protected]>
Cc: Richard Purdie <[email protected]>
Signed-off-by: Jingoo Han <[email protected]>
---
drivers/video/backlight/ot200_bl.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/video/backlight/ot200_bl.c b/drivers/video/backlight/ot200_bl.c
index f519d55..ef637ff 100644
--- a/drivers/video/backlight/ot200_bl.c
+++ b/drivers/video/backlight/ot200_bl.c
@@ -97,10 +97,10 @@ static int ot200_backlight_probe(struct platform_device *pdev)
goto error_mfgpt_alloc;
}

- data = kzalloc(sizeof(*data), GFP_KERNEL);
+ data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
if (!data) {
retval = -ENOMEM;
- goto error_kzalloc;
+ goto error_devm_kzalloc;
}

/* setup gpio */
@@ -122,16 +122,14 @@ static int ot200_backlight_probe(struct platform_device *pdev)
if (IS_ERR(bl)) {
dev_err(&pdev->dev, "failed to register backlight\n");
retval = PTR_ERR(bl);
- goto error_backlight_device_register;
+ goto error_devm_kzalloc;
}

platform_set_drvdata(pdev, bl);

return 0;

-error_backlight_device_register:
- kfree(data);
-error_kzalloc:
+error_devm_kzalloc:
cs5535_mfgpt_free_timer(pwm_timer);
error_mfgpt_alloc:
gpio_free(GPIO_DIMM);
@@ -141,7 +139,6 @@ error_mfgpt_alloc:
static int ot200_backlight_remove(struct platform_device *pdev)
{
struct backlight_device *bl = platform_get_drvdata(pdev);
- struct ot200_backlight_data *data = bl_get_data(bl);

backlight_device_unregister(bl);

@@ -154,7 +151,6 @@ static int ot200_backlight_remove(struct platform_device *pdev)
cs5535_mfgpt_free_timer(pwm_timer);
gpio_free(GPIO_DIMM);

- kfree(data);
return 0;
}

--
1.7.1

2012-06-12 06:17:56

by Christian Gmeiner

Subject: Re: [PATCH v2 2/3][RESEND] backlight: ot200_bl: use devm_ functions

looks fine

Acked-by: Christian Gmeiner <[email protected]>

---
Christian Gmeiner, MSc


2012/6/11 Jingoo Han <[email protected]>:
> The devm_ functions allocate memory that is released when a driver
> detaches. This patch uses devm_kzalloc of these functions
>
> Cc: Christian Gmeiner <[email protected]>
> Cc: Richard Purdie <[email protected]>
> Signed-off-by: Jingoo Han <[email protected]>
> ---
>  drivers/video/backlight/ot200_bl.c |   12 ++++--------
>  1 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/video/backlight/ot200_bl.c b/drivers/video/backlight/ot200_bl.c
> index f519d55..ef637ff 100644
> --- a/drivers/video/backlight/ot200_bl.c
> +++ b/drivers/video/backlight/ot200_bl.c
> @@ -97,10 +97,10 @@ static int ot200_backlight_probe(struct platform_device *pdev)
>                goto error_mfgpt_alloc;
>        }
>
> -       data = kzalloc(sizeof(*data), GFP_KERNEL);
> +       data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
>        if (!data) {
>                retval = -ENOMEM;
> -               goto error_kzalloc;
> +               goto error_devm_kzalloc;
>        }
>
>        /* setup gpio */
> @@ -122,16 +122,14 @@ static int ot200_backlight_probe(struct platform_device *pdev)
>        if (IS_ERR(bl)) {
>                dev_err(&pdev->dev, "failed to register backlight\n");
>                retval = PTR_ERR(bl);
> -               goto error_backlight_device_register;
> +               goto error_devm_kzalloc;
>        }
>
>        platform_set_drvdata(pdev, bl);
>
>        return 0;
>
> -error_backlight_device_register:
> -       kfree(data);
> -error_kzalloc:
> +error_devm_kzalloc:
>        cs5535_mfgpt_free_timer(pwm_timer);
>  error_mfgpt_alloc:
>        gpio_free(GPIO_DIMM);
> @@ -141,7 +139,6 @@ error_mfgpt_alloc:
>  static int ot200_backlight_remove(struct platform_device *pdev)
>  {
>        struct backlight_device *bl = platform_get_drvdata(pdev);
> -       struct ot200_backlight_data *data = bl_get_data(bl);
>
>        backlight_device_unregister(bl);
>
> @@ -154,7 +151,6 @@ static int ot200_backlight_remove(struct platform_device *pdev)
>        cs5535_mfgpt_free_timer(pwm_timer);
>        gpio_free(GPIO_DIMM);
>
> -       kfree(data);
>        return 0;
>  }
>
> --
> 1.7.1
>
>

2012-06-12 06:25:49

by Axel Lin

Subject: Re: [PATCH v2 2/3][RESEND] backlight: ot200_bl: use devm_ functions

> ?error_mfgpt_alloc:
> ? ? ? ?gpio_free(GPIO_DIMM);

You can also use devm_gpio_request, so you can remove gpio_free here
and remove the gpio_free in ot200_backlight_remove().

> @@ -141,7 +139,6 @@ error_mfgpt_alloc:
> ?static int ot200_backlight_remove(struct platform_device *pdev)
> ?{
> ? ? ? ?struct backlight_device *bl = platform_get_drvdata(pdev);
> - ? ? ? struct ot200_backlight_data *data = bl_get_data(bl);
>
> ? ? ? ?backlight_device_unregister(bl);
>
> @@ -154,7 +151,6 @@ static int ot200_backlight_remove(struct platform_device *pdev)
> ? ? ? ?cs5535_mfgpt_free_timer(pwm_timer);
> ? ? ? ?gpio_free(GPIO_DIMM);
>
> - ? ? ? kfree(data);
> ? ? ? ?return 0;
> ?}

2012-06-12 07:50:32

by Christian Gmeiner

Subject: Re: [PATCH v2 2/3][RESEND] backlight: ot200_bl: use devm_ functions

2012/6/12 Axel Lin <[email protected]>:
>>  error_mfgpt_alloc:
>>        gpio_free(GPIO_DIMM);
>
> You can also use devm_gpio_request, so you can remove gpio_free here
> and remove the gpio_free in ot200_backlight_remove().

nice catch