Commit c7a2bf3b authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds

backlight: aat2870: 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 f829c9ef
...@@ -158,8 +158,9 @@ static int aat2870_bl_probe(struct platform_device *pdev) ...@@ -158,8 +158,9 @@ static int aat2870_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;
bd = backlight_device_register("aat2870-backlight", &pdev->dev, bd = devm_backlight_device_register(&pdev->dev, "aat2870-backlight",
aat2870_bl, &aat2870_bl_ops, &props); &pdev->dev, aat2870_bl, &aat2870_bl_ops,
&props);
if (IS_ERR(bd)) { if (IS_ERR(bd)) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Failed allocate memory for backlight device\n"); "Failed allocate memory for backlight device\n");
...@@ -194,13 +195,11 @@ static int aat2870_bl_probe(struct platform_device *pdev) ...@@ -194,13 +195,11 @@ static int aat2870_bl_probe(struct platform_device *pdev)
ret = aat2870_bl_update_status(bd); ret = aat2870_bl_update_status(bd);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Failed to initialize\n"); dev_err(&pdev->dev, "Failed to initialize\n");
goto out_bl_dev_unregister; return ret;
} }
return 0; return 0;
out_bl_dev_unregister:
backlight_device_unregister(bd);
out: out:
return ret; return ret;
} }
...@@ -214,8 +213,6 @@ static int aat2870_bl_remove(struct platform_device *pdev) ...@@ -214,8 +213,6 @@ static int aat2870_bl_remove(struct platform_device *pdev)
bd->props.brightness = 0; bd->props.brightness = 0;
backlight_update_status(bd); backlight_update_status(bd);
backlight_device_unregister(bd);
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