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

Commit 3e61c73c authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

backlight: atmel-pwm-bl: 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 83dedc05

drivers/video/backlight/atmel-pwm-bl.c

+4 −6
Original line number Diff line number Diff line
@@ -171,8 +171,9 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev) 
	memset(&props, 0, sizeof(struct backlight_properties));

	props.type = BACKLIGHT_RAW;

	props.max_brightness = pdata->pwm_duty_max - pdata->pwm_duty_min;

	bldev = backlight_device_register("atmel-pwm-bl", &pdev->dev, pwmbl,

					  &atmel_pwm_bl_ops, &props);

	bldev = devm_backlight_device_register(&pdev->dev, "atmel-pwm-bl",

					&pdev->dev, pwmbl, &atmel_pwm_bl_ops,

					&props);

	if (IS_ERR(bldev)) {

		retval = PTR_ERR(bldev);

		goto err_free_pwm;
@@ -188,14 +189,12 @@ static int atmel_pwm_bl_probe(struct platform_device *pdev) 


	retval = atmel_pwm_bl_init_pwm(pwmbl);

	if (retval)

		goto err_free_bl_dev;

		goto err_free_pwm;



	atmel_pwm_bl_set_intensity(bldev);



	return 0;



err_free_bl_dev:

	backlight_device_unregister(bldev);

err_free_pwm:

	pwm_channel_free(&pwmbl->pwmc);

err_free_mem:
@@ -210,7 +209,6 @@ static int atmel_pwm_bl_remove(struct platform_device *pdev) 
		gpio_set_value(pwmbl->gpio_on, 0);

	pwm_channel_disable(&pwmbl->pwmc);

	pwm_channel_free(&pwmbl->pwmc);

	backlight_device_unregister(pwmbl->bldev);



	return 0;

}