linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 3/3] backlight: lm3533_bl: use devm_ functions
@ 2012-05-21  9:20 Jingoo Han
  2012-05-21  9:58 ` Johan Hovold
  2012-05-22  0:01 ` [PATCH v2 " Jingoo Han
  0 siblings, 2 replies; 5+ messages in thread
From: Jingoo Han @ 2012-05-21  9:20 UTC (permalink / raw)
  To: 'Andrew Morton', 'LKML'
  Cc: 'Richard Purdie', 'Johan Hovold', 'Jingoo Han'

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

Cc: Johan Hovold <jhovold@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/video/backlight/lm3533_bl.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
index 0148227..9f96a6b 100644
--- a/drivers/video/backlight/lm3533_bl.c
+++ b/drivers/video/backlight/lm3533_bl.c
@@ -295,7 +295,7 @@ static int __devinit lm3533_bl_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	bl = kzalloc(sizeof(*bl), GFP_KERNEL);
+	bl = devm_kzalloc(&pdev->dev, sizeof(*bl), GFP_KERNEL);
 	if (!bl) {
 		dev_err(&pdev->dev,
 				"failed to allocate memory for backlight\n");
@@ -318,7 +318,7 @@ static int __devinit lm3533_bl_probe(struct platform_device *pdev)
 	if (IS_ERR(bd)) {
 		dev_err(&pdev->dev, "failed to register backlight device\n");
 		ret = PTR_ERR(bd);
-		goto err_free;
+		goto err_return;
 	}
 
 	bl->bd = bd;
@@ -348,8 +348,7 @@ err_sysfs_remove:
 	sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
 err_unregister:
 	backlight_device_unregister(bd);
-err_free:
-	kfree(bl);
+err_return:
 
 	return ret;
 }
@@ -367,7 +366,6 @@ static int __devexit lm3533_bl_remove(struct platform_device *pdev)
 	lm3533_ctrlbank_disable(&bl->cb);
 	sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
 	backlight_device_unregister(bd);
-	kfree(bl);
 
 	return 0;
 }
-- 
1.7.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH 3/3] backlight: lm3533_bl: use devm_ functions
  2012-05-21  9:20 [PATCH 3/3] backlight: lm3533_bl: use devm_ functions Jingoo Han
@ 2012-05-21  9:58 ` Johan Hovold
  2012-05-21 23:50   ` Jingoo Han
  2012-05-22  0:01 ` [PATCH v2 " Jingoo Han
  1 sibling, 1 reply; 5+ messages in thread
From: Johan Hovold @ 2012-05-21  9:58 UTC (permalink / raw)
  To: Jingoo Han
  Cc: 'Andrew Morton', 'LKML', 'Richard Purdie',
	'Johan Hovold'

On Mon, May 21, 2012 at 06:20:01PM +0900, Jingoo Han wrote:
> The devm_ functions allocate memory that is released when a driver
> detaches. This patch uses devm_kzalloc of these functions.
> 
> Cc: Johan Hovold <jhovold@gmail.com>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
>  drivers/video/backlight/lm3533_bl.c |    8 +++-----
>  1 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
> index 0148227..9f96a6b 100644
> --- a/drivers/video/backlight/lm3533_bl.c
> +++ b/drivers/video/backlight/lm3533_bl.c
> @@ -295,7 +295,7 @@ static int __devinit lm3533_bl_probe(struct platform_device *pdev)
>  		return -EINVAL;
>  	}
>  
> -	bl = kzalloc(sizeof(*bl), GFP_KERNEL);
> +	bl = devm_kzalloc(&pdev->dev, sizeof(*bl), GFP_KERNEL);
>  	if (!bl) {
>  		dev_err(&pdev->dev,
>  				"failed to allocate memory for backlight\n");
> @@ -318,7 +318,7 @@ static int __devinit lm3533_bl_probe(struct platform_device *pdev)
>  	if (IS_ERR(bd)) {
>  		dev_err(&pdev->dev, "failed to register backlight device\n");
>  		ret = PTR_ERR(bd);
> -		goto err_free;
> +		goto err_return;

Why not simply return PTR_ERR(bd) here?

>  	}
>  
>  	bl->bd = bd;
> @@ -348,8 +348,7 @@ err_sysfs_remove:
>  	sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
>  err_unregister:
>  	backlight_device_unregister(bd);
> -err_free:
> -	kfree(bl);
> +err_return:

No need for this label then.

>  
>  	return ret;
>  }
> @@ -367,7 +366,6 @@ static int __devexit lm3533_bl_remove(struct platform_device *pdev)
>  	lm3533_ctrlbank_disable(&bl->cb);
>  	sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
>  	backlight_device_unregister(bd);
> -	kfree(bl);
>  
>  	return 0;
>  }

^ permalink raw reply	[flat|nested] 5+ messages in thread
* RE: [PATCH 3/3] backlight: lm3533_bl: use devm_ functions
  2012-05-21  9:58 ` Johan Hovold
@ 2012-05-21 23:50   ` Jingoo Han
  0 siblings, 0 replies; 5+ messages in thread
From: Jingoo Han @ 2012-05-21 23:50 UTC (permalink / raw)
  To: 'Johan Hovold'
  Cc: 'Andrew Morton', 'LKML', 'Richard Purdie',
	'Jingoo Han'

On Mon, May 21, 2012 at 06 6:59:00 PM +0900, Johan Hovol wrote:
>
> On Mon, May 21, 2012 at 06:20:01PM +0900, Jingoo Han wrote:
> > The devm_ functions allocate memory that is released when a driver
> > detaches. This patch uses devm_kzalloc of these functions.
> >
> > Cc: Johan Hovold <jhovold@gmail.com>
> > Cc: Richard Purdie <rpurdie@rpsys.net>
> > Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> > ---
> >  drivers/video/backlight/lm3533_bl.c |    8 +++-----
> >  1 files changed, 3 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
> > index 0148227..9f96a6b 100644
> > --- a/drivers/video/backlight/lm3533_bl.c
> > +++ b/drivers/video/backlight/lm3533_bl.c
> > @@ -295,7 +295,7 @@ static int __devinit lm3533_bl_probe(struct platform_device *pdev)
> >  		return -EINVAL;
> >  	}
> >
> > -	bl = kzalloc(sizeof(*bl), GFP_KERNEL);
> > +	bl = devm_kzalloc(&pdev->dev, sizeof(*bl), GFP_KERNEL);
> >  	if (!bl) {
> >  		dev_err(&pdev->dev,
> >  				"failed to allocate memory for backlight\n");
> > @@ -318,7 +318,7 @@ static int __devinit lm3533_bl_probe(struct platform_device *pdev)
> >  	if (IS_ERR(bd)) {
> >  		dev_err(&pdev->dev, "failed to register backlight device\n");
> >  		ret = PTR_ERR(bd);
> > -		goto err_free;
> > +		goto err_return;
> 
> Why not simply return PTR_ERR(bd) here?

Yes, you're right.
I will send the new patch.
Thanks.

Best regards,
Jingoo Han

> 
> >  	}
> >
> >  	bl->bd = bd;
> > @@ -348,8 +348,7 @@ err_sysfs_remove:
> >  	sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
> >  err_unregister:
> >  	backlight_device_unregister(bd);
> > -err_free:
> > -	kfree(bl);
> > +err_return:
> 
> No need for this label then.
> 
> >
> >  	return ret;
> >  }
> > @@ -367,7 +366,6 @@ static int __devexit lm3533_bl_remove(struct platform_device *pdev)
> >  	lm3533_ctrlbank_disable(&bl->cb);
> >  	sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
> >  	backlight_device_unregister(bd);
> > -	kfree(bl);
> >
> >  	return 0;
> >  }


^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH v2 3/3] backlight: lm3533_bl: use devm_ functions
  2012-05-21  9:20 [PATCH 3/3] backlight: lm3533_bl: use devm_ functions Jingoo Han
  2012-05-21  9:58 ` Johan Hovold
@ 2012-05-22  0:01 ` Jingoo Han
  2012-05-22  8:25   ` Johan Hovold
  1 sibling, 1 reply; 5+ messages in thread
From: Jingoo Han @ 2012-05-22  0:01 UTC (permalink / raw)
  To: 'Andrew Morton', 'LKML'
  Cc: 'Richard Purdie', 'Johan Hovold', 'Jingoo Han'

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

Cc: Johan Hovold <jhovold@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/video/backlight/lm3533_bl.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
index 0148227..d916ffe 100644
--- a/drivers/video/backlight/lm3533_bl.c
+++ b/drivers/video/backlight/lm3533_bl.c
@@ -295,7 +295,7 @@ static int __devinit lm3533_bl_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	bl = kzalloc(sizeof(*bl), GFP_KERNEL);
+	bl = devm_kzalloc(&pdev->dev, sizeof(*bl), GFP_KERNEL);
 	if (!bl) {
 		dev_err(&pdev->dev,
 				"failed to allocate memory for backlight\n");
@@ -317,8 +317,7 @@ static int __devinit lm3533_bl_probe(struct platform_device *pdev)
 						&lm3533_bl_ops, &props);
 	if (IS_ERR(bd)) {
 		dev_err(&pdev->dev, "failed to register backlight device\n");
-		ret = PTR_ERR(bd);
-		goto err_free;
+		return PTR_ERR(bd);
 	}
 
 	bl->bd = bd;
@@ -348,8 +347,6 @@ err_sysfs_remove:
 	sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
 err_unregister:
 	backlight_device_unregister(bd);
-err_free:
-	kfree(bl);
 
 	return ret;
 }
@@ -367,7 +364,6 @@ static int __devexit lm3533_bl_remove(struct platform_device *pdev)
 	lm3533_ctrlbank_disable(&bl->cb);
 	sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
 	backlight_device_unregister(bd);
-	kfree(bl);
 
 	return 0;
 }
-- 
1.7.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH v2 3/3] backlight: lm3533_bl: use devm_ functions
  2012-05-22  0:01 ` [PATCH v2 " Jingoo Han
@ 2012-05-22  8:25   ` Johan Hovold
  0 siblings, 0 replies; 5+ messages in thread
From: Johan Hovold @ 2012-05-22  8:25 UTC (permalink / raw)
  To: Jingoo Han
  Cc: 'Andrew Morton', 'LKML', 'Richard Purdie',
	'Johan Hovold'

On Tue, May 22, 2012 at 09:01:49AM +0900, Jingoo Han wrote:
> The devm_ functions allocate memory that is released when a driver
> detaches. This patch uses devm_kzalloc of these functions.
> 
> Cc: Johan Hovold <jhovold@gmail.com>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>

Acked-by: Johan Hovold <jhovold@gmail.com>

Thanks,
Johan

> ---
>  drivers/video/backlight/lm3533_bl.c |    8 ++------
>  1 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
> index 0148227..d916ffe 100644
> --- a/drivers/video/backlight/lm3533_bl.c
> +++ b/drivers/video/backlight/lm3533_bl.c
> @@ -295,7 +295,7 @@ static int __devinit lm3533_bl_probe(struct platform_device *pdev)
>  		return -EINVAL;
>  	}
>  
> -	bl = kzalloc(sizeof(*bl), GFP_KERNEL);
> +	bl = devm_kzalloc(&pdev->dev, sizeof(*bl), GFP_KERNEL);
>  	if (!bl) {
>  		dev_err(&pdev->dev,
>  				"failed to allocate memory for backlight\n");
> @@ -317,8 +317,7 @@ static int __devinit lm3533_bl_probe(struct platform_device *pdev)
>  						&lm3533_bl_ops, &props);
>  	if (IS_ERR(bd)) {
>  		dev_err(&pdev->dev, "failed to register backlight device\n");
> -		ret = PTR_ERR(bd);
> -		goto err_free;
> +		return PTR_ERR(bd);
>  	}
>  
>  	bl->bd = bd;
> @@ -348,8 +347,6 @@ err_sysfs_remove:
>  	sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
>  err_unregister:
>  	backlight_device_unregister(bd);
> -err_free:
> -	kfree(bl);
>  
>  	return ret;
>  }
> @@ -367,7 +364,6 @@ static int __devexit lm3533_bl_remove(struct platform_device *pdev)
>  	lm3533_ctrlbank_disable(&bl->cb);
>  	sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
>  	backlight_device_unregister(bd);
> -	kfree(bl);
>  
>  	return 0;
>  }

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-05-22  8:25 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-21  9:20 [PATCH 3/3] backlight: lm3533_bl: use devm_ functions Jingoo Han
2012-05-21  9:58 ` Johan Hovold
2012-05-21 23:50   ` Jingoo Han
2012-05-22  0:01 ` [PATCH v2 " Jingoo Han
2012-05-22  8:25   ` Johan Hovold

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).