1 files changed, 5 insertions, 7 deletions

diff --git a/drivers/video/backlight/lm3533_bl.c b/drivers/video/backlight/lm3533_bl.c
index 1d1dbfb789e3..187d1c283c1d 100644
--- a/drivers/video/backlight/lm3533_bl.c
+++ b/drivers/video/backlight/lm3533_bl.c
@@ -284,7 +284,7 @@ static int lm3533_bl_probe(struct platform_device *pdev)
         if (!lm3533)
                 return -EINVAL;
 
-        pdata = pdev->dev.platform_data;
+        pdata = dev_get_platdata(&pdev->dev);
         if (!pdata) {
                 dev_err(&pdev->dev, "no platform data\n");
                 return -EINVAL;
@@ -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;
 }