backlight: lm3533_bl: use devm_backlight_device_register()
authorJingoo Han <jg1.han@samsung.com>
Tue, 12 Nov 2013 23:09:18 +0000 (15:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 03:09:18 +0000 (12:09 +0900)
Use devm_backlight_device_register() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/backlight/lm3533_bl.c

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