openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

backlight: adp8870: 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:09 -08:00 committed by Linus Torvalds
parent 91fa4ee8f4
commit 568ee6c3c8
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/video/backlight/adp8870_bl.c
View File

@ -888,8 +888,9 @@ static int adp8870_probe(struct i2c_client *client,
memset(&props, 0, sizeof(props)); memset(&props, 0, sizeof(props));
props.type = BACKLIGHT_RAW; props.type = BACKLIGHT_RAW;
props.max_brightness = props.brightness = ADP8870_MAX_BRIGHTNESS; props.max_brightness = props.brightness = ADP8870_MAX_BRIGHTNESS;
bl = backlight_device_register(dev_driver_string(&client->dev), bl = devm_backlight_device_register(&client->dev,
&client->dev, data, &adp8870_bl_ops, &props); dev_driver_string(&client->dev),
&client->dev, data, &adp8870_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");
return PTR_ERR(bl); return PTR_ERR(bl);
@ -902,7 +903,7 @@ static int adp8870_probe(struct i2c_client *client,
&adp8870_bl_attr_group); &adp8870_bl_attr_group);
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;
} }
} }
@ -925,8 +926,6 @@ static int adp8870_probe(struct i2c_client *client,
if (data->pdata->en_ambl_sens) if (data->pdata->en_ambl_sens)
sysfs_remove_group(&data->bl->dev.kobj, sysfs_remove_group(&data->bl->dev.kobj,
&adp8870_bl_attr_group); &adp8870_bl_attr_group);
out1:
backlight_device_unregister(bl);
return ret; return ret;
} }
@ -944,8 +943,6 @@ static int adp8870_remove(struct i2c_client *client)
sysfs_remove_group(&data->bl->dev.kobj, sysfs_remove_group(&data->bl->dev.kobj,
&adp8870_bl_attr_group); &adp8870_bl_attr_group);
backlight_device_unregister(data->bl);
return 0; return 0;
} }