]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
backlight: aat2870: use devm_backlight_device_register()
authorJingoo Han <jg1.han@samsung.com>
Tue, 5 Nov 2013 05:56:22 +0000 (16:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 5 Nov 2013 05:56:22 +0000 (16:56 +1100)
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>
drivers/video/backlight/aat2870_bl.c

index c68232b8b7de65992d487377dad4ed96d6d48203..ee0c0a982e4eebb8be7ebc06fc9866f1c1ac0e66 100644 (file)
@@ -158,8 +158,9 @@ static int aat2870_bl_probe(struct platform_device *pdev)
        memset(&props, 0, sizeof(struct backlight_properties));
 
        props.type = BACKLIGHT_RAW;
-       bd = backlight_device_register("aat2870-backlight", &pdev->dev,
-                                      aat2870_bl, &aat2870_bl_ops, &props);
+       bd = devm_backlight_device_register(&pdev->dev, "aat2870-backlight",
+                                       &pdev->dev, aat2870_bl, &aat2870_bl_ops,
+                                       &props);
        if (IS_ERR(bd)) {
                dev_err(&pdev->dev,
                        "Failed allocate memory for backlight device\n");
@@ -194,13 +195,11 @@ static int aat2870_bl_probe(struct platform_device *pdev)
        ret = aat2870_bl_update_status(bd);
        if (ret < 0) {
                dev_err(&pdev->dev, "Failed to initialize\n");
-               goto out_bl_dev_unregister;
+               return ret;
        }
 
        return 0;
 
-out_bl_dev_unregister:
-       backlight_device_unregister(bd);
 out:
        return ret;
 }
@@ -214,8 +213,6 @@ static int aat2870_bl_remove(struct platform_device *pdev)
        bd->props.brightness = 0;
        backlight_update_status(bd);
 
-       backlight_device_unregister(bd);
-
        return 0;
 }