p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Jingoo Han 2013-11-12 15:09:08 -08:00 committed by Linus Torvalds
parent 5f652c710d
commit 91fa4ee8f4
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/video/backlight/adp8860_bl.c
View File

@ -711,7 +711,8 @@ static int adp8860_probe(struct i2c_client *client,
mutex_init(&data->lock); mutex_init(&data->lock);
bl = backlight_device_register(dev_driver_string(&client->dev), bl = devm_backlight_device_register(&client->dev,
dev_driver_string(&client->dev),
&client->dev, data, &adp8860_bl_ops, &props); &client->dev, data, &adp8860_bl_ops, &props);
if (IS_ERR(bl)) { if (IS_ERR(bl)) {
dev_err(&client->dev, "failed to register backlight\n"); dev_err(&client->dev, "failed to register backlight\n");
@ -728,7 +729,7 @@ static int adp8860_probe(struct i2c_client *client,
if (ret) { if (ret) {
dev_err(&client->dev, "failed to register sysfs\n"); dev_err(&client->dev, "failed to register sysfs\n");
goto out1; return ret;
} }
ret = adp8860_bl_setup(bl); ret = adp8860_bl_setup(bl);
@ -751,8 +752,6 @@ static int adp8860_probe(struct i2c_client *client,
if (data->en_ambl_sens) if (data->en_ambl_sens)
sysfs_remove_group(&data->bl->dev.kobj, sysfs_remove_group(&data->bl->dev.kobj,
&adp8860_bl_attr_group); &adp8860_bl_attr_group);
out1:
backlight_device_unregister(bl);
return ret; return ret;
} }
@ -770,8 +769,6 @@ static int adp8860_remove(struct i2c_client *client)
sysfs_remove_group(&data->bl->dev.kobj, sysfs_remove_group(&data->bl->dev.kobj,
&adp8860_bl_attr_group); &adp8860_bl_attr_group);
backlight_device_unregister(data->bl);
return 0; return 0;
} }