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

backlight: lm3533_bl: 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 da653785
...@@ -313,8 +313,9 @@ static int lm3533_bl_probe(struct platform_device *pdev) ...@@ -313,8 +313,9 @@ static int lm3533_bl_probe(struct platform_device *pdev)
props.type = BACKLIGHT_RAW; props.type = BACKLIGHT_RAW;
props.max_brightness = LM3533_BL_MAX_BRIGHTNESS; props.max_brightness = LM3533_BL_MAX_BRIGHTNESS;
props.brightness = pdata->default_brightness; props.brightness = pdata->default_brightness;
bd = backlight_device_register(pdata->name, pdev->dev.parent, bl, bd = devm_backlight_device_register(&pdev->dev, pdata->name,
&lm3533_bl_ops, &props); pdev->dev.parent, bl, &lm3533_bl_ops,
&props);
if (IS_ERR(bd)) { if (IS_ERR(bd)) {
dev_err(&pdev->dev, "failed to register backlight device\n"); dev_err(&pdev->dev, "failed to register backlight device\n");
return PTR_ERR(bd); return PTR_ERR(bd);
...@@ -328,7 +329,7 @@ static int lm3533_bl_probe(struct platform_device *pdev) ...@@ -328,7 +329,7 @@ static int lm3533_bl_probe(struct platform_device *pdev)
ret = sysfs_create_group(&bd->dev.kobj, &lm3533_bl_attribute_group); ret = sysfs_create_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "failed to create sysfs attributes\n"); dev_err(&pdev->dev, "failed to create sysfs attributes\n");
goto err_unregister; return ret;
} }
backlight_update_status(bd); backlight_update_status(bd);
...@@ -345,8 +346,6 @@ static int lm3533_bl_probe(struct platform_device *pdev) ...@@ -345,8 +346,6 @@ static int lm3533_bl_probe(struct platform_device *pdev)
err_sysfs_remove: err_sysfs_remove:
sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group); sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
err_unregister:
backlight_device_unregister(bd);
return ret; return ret;
} }
...@@ -363,7 +362,6 @@ static int lm3533_bl_remove(struct platform_device *pdev) ...@@ -363,7 +362,6 @@ static int lm3533_bl_remove(struct platform_device *pdev)
lm3533_ctrlbank_disable(&bl->cb); lm3533_ctrlbank_disable(&bl->cb);
sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group); sysfs_remove_group(&bd->dev.kobj, &lm3533_bl_attribute_group);
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