Commit 5f652c71 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds

backlight: adp5520: use devm_backlight_device_register()

Use devm_backlight_device_register() to make cleanup paths simpler.
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c7a2bf3b
...@@ -312,8 +312,9 @@ static int adp5520_bl_probe(struct platform_device *pdev) ...@@ -312,8 +312,9 @@ static int adp5520_bl_probe(struct platform_device *pdev)
memset(&props, 0, sizeof(struct backlight_properties)); memset(&props, 0, sizeof(struct backlight_properties));
props.type = BACKLIGHT_RAW; props.type = BACKLIGHT_RAW;
props.max_brightness = ADP5020_MAX_BRIGHTNESS; props.max_brightness = ADP5020_MAX_BRIGHTNESS;
bl = backlight_device_register(pdev->name, data->master, data, bl = devm_backlight_device_register(&pdev->dev, pdev->name,
&adp5520_bl_ops, &props); data->master, data, &adp5520_bl_ops,
&props);
if (IS_ERR(bl)) { if (IS_ERR(bl)) {
dev_err(&pdev->dev, "failed to register backlight\n"); dev_err(&pdev->dev, "failed to register backlight\n");
return PTR_ERR(bl); return PTR_ERR(bl);
...@@ -326,7 +327,7 @@ static int adp5520_bl_probe(struct platform_device *pdev) ...@@ -326,7 +327,7 @@ static int adp5520_bl_probe(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to register sysfs\n"); dev_err(&pdev->dev, "failed to register sysfs\n");
backlight_device_unregister(bl); return ret;
} }
platform_set_drvdata(pdev, bl); platform_set_drvdata(pdev, bl);
...@@ -347,8 +348,6 @@ static int adp5520_bl_remove(struct platform_device *pdev) ...@@ -347,8 +348,6 @@ static int adp5520_bl_remove(struct platform_device *pdev)
sysfs_remove_group(&bl->dev.kobj, sysfs_remove_group(&bl->dev.kobj,
&adp5520_bl_attr_group); &adp5520_bl_attr_group);
backlight_device_unregister(bl);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment