diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-03-08 12:45:58 +0900 | 
|---|---|---|
| committer | Thierry Reding <thierry.reding@avionic-design.de> | 2013-03-08 08:30:50 +0100 | 
| commit | 482467ad97b633b28f57c347440d97c108dc4bfb (patch) | |
| tree | 78f8dc61214a37283fd88ef13824aff62c131e20 /drivers/pwm/pwm-ab8500.c | |
| parent | c791126b93e800c68557483235321b201c082910 (diff) | |
| download | blackbird-op-linux-482467ad97b633b28f57c347440d97c108dc4bfb.tar.gz blackbird-op-linux-482467ad97b633b28f57c347440d97c108dc4bfb.zip | |
pwm: ab8500: use devm_kzalloc()
Use devm_kzalloc() to make cleanup paths more simple.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Diffstat (limited to 'drivers/pwm/pwm-ab8500.c')
| -rw-r--r-- | drivers/pwm/pwm-ab8500.c | 7 | 
1 files changed, 2 insertions, 5 deletions
| diff --git a/drivers/pwm/pwm-ab8500.c b/drivers/pwm/pwm-ab8500.c index 4248d0418273..93af1bbf88ce 100644 --- a/drivers/pwm/pwm-ab8500.c +++ b/drivers/pwm/pwm-ab8500.c @@ -99,7 +99,7 @@ static int ab8500_pwm_probe(struct platform_device *pdev)  	 * Nothing to be done in probe, this is required to get the  	 * device which is required for ab8500 read and write  	 */ -	ab8500 = kzalloc(sizeof(*ab8500), GFP_KERNEL); +	ab8500 = devm_kzalloc(&pdev->dev, sizeof(*ab8500), GFP_KERNEL);  	if (ab8500 == NULL) {  		dev_err(&pdev->dev, "failed to allocate memory\n");  		return -ENOMEM; @@ -111,10 +111,8 @@ static int ab8500_pwm_probe(struct platform_device *pdev)  	ab8500->chip.npwm = 1;  	err = pwmchip_add(&ab8500->chip); -	if (err < 0) { -		kfree(ab8500); +	if (err < 0)  		return err; -	}  	dev_dbg(&pdev->dev, "pwm probe successful\n");  	platform_set_drvdata(pdev, ab8500); @@ -132,7 +130,6 @@ static int ab8500_pwm_remove(struct platform_device *pdev)  		return err;  	dev_dbg(&pdev->dev, "pwm driver removed\n"); -	kfree(ab8500);  	return 0;  } | 

