OSDN Git Service

backlight: omap1: use devm_backlight_device_register()
authorJingoo Han <jg1.han@samsung.com>
Thu, 23 Jan 2014 23:54:26 +0000 (15:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jan 2014 00:36:56 +0000 (16:36 -0800)
Use devm_backlight_device_register() to make cleanup paths simpler,
and remove unnecessary remove().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/backlight/omap1_bl.c

index ac11a46..a0dcd88 100644 (file)
@@ -146,8 +146,8 @@ static int omapbl_probe(struct platform_device *pdev)
        memset(&props, 0, sizeof(struct backlight_properties));
        props.type = BACKLIGHT_RAW;
        props.max_brightness = OMAPBL_MAX_INTENSITY;
-       dev = backlight_device_register("omap-bl", &pdev->dev, bl, &omapbl_ops,
-                                       &props);
+       dev = devm_backlight_device_register(&pdev->dev, "omap-bl", &pdev->dev,
+                                       bl, &omapbl_ops, &props);
        if (IS_ERR(dev))
                return PTR_ERR(dev);
 
@@ -170,20 +170,10 @@ static int omapbl_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int omapbl_remove(struct platform_device *pdev)
-{
-       struct backlight_device *dev = platform_get_drvdata(pdev);
-
-       backlight_device_unregister(dev);
-
-       return 0;
-}
-
 static SIMPLE_DEV_PM_OPS(omapbl_pm_ops, omapbl_suspend, omapbl_resume);
 
 static struct platform_driver omapbl_driver = {
        .probe          = omapbl_probe,
-       .remove         = omapbl_remove,
        .driver         = {
                .name   = "omap-bl",
                .pm     = &omapbl_pm_ops,