backlight: wm831x_bl: use devm_backlight_device_register()
authorJingoo Han <jg1.han@samsung.com>
Tue, 12 Nov 2013 23:09:25 +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, and
remove unnecessary remove().

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/wm831x_bl.c

index 2ccf3206e93f34d1b61c477bc3bc895c640f985c..8b9455e9306930027b4fa20454b2ac837d8b4ff9 100644 (file)
@@ -195,8 +195,8 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
        memset(&props, 0, sizeof(props));
        props.type = BACKLIGHT_RAW;
        props.max_brightness = max_isel;
-       bl = backlight_device_register("wm831x", &pdev->dev, data,
-                                      &wm831x_backlight_ops, &props);
+       bl = devm_backlight_device_register(&pdev->dev, "wm831x", &pdev->dev,
+                                       data, &wm831x_backlight_ops, &props);
        if (IS_ERR(bl)) {
                dev_err(&pdev->dev, "failed to register backlight\n");
                return PTR_ERR(bl);
@@ -214,21 +214,12 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int wm831x_backlight_remove(struct platform_device *pdev)
-{
-       struct backlight_device *bl = platform_get_drvdata(pdev);
-
-       backlight_device_unregister(bl);
-       return 0;
-}
-
 static struct platform_driver wm831x_backlight_driver = {
        .driver         = {
                .name   = "wm831x-backlight",
                .owner  = THIS_MODULE,
        },
        .probe          = wm831x_backlight_probe,
-       .remove         = wm831x_backlight_remove,
 };
 
 module_platform_driver(wm831x_backlight_driver);