korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-04 09:34:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

leds: convert HTC ASIC3 LED driver to devm_kzalloc() and cleanup error exit path

Browse Source 
Cc: Paul Parsons <lost.distance@yahoo.com>
Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
This commit is contained in:
Bryan Wu 2012-07-03 12:47:16 +08:00
parent 8095c385aa
commit 60a0aadbf8
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/leds/leds-asic3.c
View File

@ -99,12 +99,13 @@ static int __devinit asic3_led_probe(struct platform_device *pdev)
ret = mfd_cell_enable(pdev); ret = mfd_cell_enable(pdev);
if (ret < 0) if (ret < 0)
goto ret0; return ret;
led->cdev = kzalloc(sizeof(struct led_classdev), GFP_KERNEL); led->cdev = devm_kzalloc(&pdev->dev, sizeof(struct led_classdev),
GFP_KERNEL);
if (!led->cdev) { if (!led->cdev) {
ret = -ENOMEM; ret = -ENOMEM;
goto ret1; goto out;
} }
led->cdev->name = led->name; led->cdev->name = led->name;
@ -115,15 +116,12 @@ static int __devinit asic3_led_probe(struct platform_device *pdev)
ret = led_classdev_register(&pdev->dev, led->cdev); ret = led_classdev_register(&pdev->dev, led->cdev);
if (ret < 0) if (ret < 0)
goto ret2; goto out;
return 0; return 0;
ret2: out:
kfree(led->cdev);
ret1:
(void) mfd_cell_disable(pdev); (void) mfd_cell_disable(pdev);
ret0:
return ret; return ret;
} }
@ -133,8 +131,6 @@ static int __devexit asic3_led_remove(struct platform_device *pdev)
led_classdev_unregister(led->cdev); led_classdev_unregister(led->cdev);
kfree(led->cdev);
return mfd_cell_disable(pdev); return mfd_cell_disable(pdev);
} }