Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 568ee6c3 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

backlight: adp8870: use devm_backlight_device_register() 



Use devm_backlight_device_register() to make cleanup paths simpler.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 91fa4ee8

drivers/video/backlight/adp8870_bl.c

+4 −7
Original line number Diff line number Diff line
@@ -888,7 +888,8 @@ static int adp8870_probe(struct i2c_client *client, 
	memset(&props, 0, sizeof(props));

	props.type = BACKLIGHT_RAW;

	props.max_brightness = props.brightness = ADP8870_MAX_BRIGHTNESS;

	bl = backlight_device_register(dev_driver_string(&client->dev),

	bl = devm_backlight_device_register(&client->dev,

				dev_driver_string(&client->dev),

				&client->dev, data, &adp8870_bl_ops, &props);

	if (IS_ERR(bl)) {

		dev_err(&client->dev, "failed to register backlight\n");
@@ -902,7 +903,7 @@ static int adp8870_probe(struct i2c_client *client, 
			&adp8870_bl_attr_group);

		if (ret) {

			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)

		sysfs_remove_group(&data->bl->dev.kobj,

			&adp8870_bl_attr_group);

out1:

	backlight_device_unregister(bl);



	return ret;

}
@@ -944,8 +943,6 @@ static int adp8870_remove(struct i2c_client *client) 
		sysfs_remove_group(&data->bl->dev.kobj,

			&adp8870_bl_attr_group);



	backlight_device_unregister(data->bl);



	return 0;

}