Merge branch 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / video / backlight / ot200_bl.c

diff --git a/drivers/video/backlight/ot200_bl.c b/drivers/video/backlight/ot200_bl.c
index fdbb6ee..f5a5202 100644 (file)
--- a/drivers/video/backlight/ot200_bl.c
+++ b/drivers/video/backlight/ot200_bl.c
@@ -118,8 +118,9 @@ static int ot200_backlight_probe(struct platform_device *pdev)
        props.brightness = 100;
        props.type = BACKLIGHT_RAW;
 
-       bl = backlight_device_register(dev_name(&pdev->dev), &pdev->dev, data,
-                                       &ot200_backlight_ops, &props);
+       bl = devm_backlight_device_register(&pdev->dev, dev_name(&pdev->dev),
+                                       &pdev->dev, data, &ot200_backlight_ops,
+                                       &props);
        if (IS_ERR(bl)) {
                dev_err(&pdev->dev, "failed to register backlight\n");
                retval = PTR_ERR(bl);
@@ -137,10 +138,6 @@ error_devm_kzalloc:
 
 static int ot200_backlight_remove(struct platform_device *pdev)
 {
-       struct backlight_device *bl = platform_get_drvdata(pdev);
-
-       backlight_device_unregister(bl);
-
        /* on module unload set brightness to 100% */
        cs5535_mfgpt_write(pwm_timer, MFGPT_REG_COUNTER, 0);
        cs5535_mfgpt_write(pwm_timer, MFGPT_REG_SETUP, MFGPT_SETUP_CNTEN);