backlight: adp8860: use devm_backlight_device_register()

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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/video/backlight/adp8860_bl.c b/drivers/video/backlight/adp8860_bl.c
index 2f77f37fac3cacc2662085e0afb1d7ce1f266245..9d656717d0f784cef243630d559ab93d674c45a8 100644 (file)
--- a/drivers/video/backlight/adp8860_bl.c
+++ b/drivers/video/backlight/adp8860_bl.c
@@ -711,8 +711,9 @@ static int adp8860_probe(struct i2c_client *client,
 
        mutex_init(&data->lock);
 
-       bl = backlight_device_register(dev_driver_string(&client->dev),
-                       &client->dev, data, &adp8860_bl_ops, &props);
+       bl = devm_backlight_device_register(&client->dev,
+                               dev_driver_string(&client->dev),
+                               &client->dev, data, &adp8860_bl_ops, &props);
        if (IS_ERR(bl)) {
                dev_err(&client->dev, "failed to register backlight\n");
                return PTR_ERR(bl);
@@ -728,7 +729,7 @@ static int adp8860_probe(struct i2c_client *client,
 
        if (ret) {
                dev_err(&client->dev, "failed to register sysfs\n");
-               goto out1;
+               return ret;
        }
 
        ret = adp8860_bl_setup(bl);
@@ -751,8 +752,6 @@ out:
        if (data->en_ambl_sens)
                sysfs_remove_group(&data->bl->dev.kobj,
                        &adp8860_bl_attr_group);
-out1:
-       backlight_device_unregister(bl);
 
        return ret;
 }
@@ -770,8 +769,6 @@ static int adp8860_remove(struct i2c_client *client)
                sysfs_remove_group(&data->bl->dev.kobj,
                        &adp8860_bl_attr_group);
 
-       backlight_device_unregister(data->bl);
-
        return 0;
 }