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

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

backlight: s6e63m0: use devm_{backlight,lcd}_device_register() 



Use devm_backlight_device_register() and devm_lcd_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 289a65e4

drivers/video/backlight/s6e63m0.c

+7 −13
Original line number Diff line number Diff line
@@ -741,7 +741,8 @@ static int s6e63m0_probe(struct spi_device *spi) 
		return -EINVAL;

	}



	ld = lcd_device_register("s6e63m0", &spi->dev, lcd, &s6e63m0_lcd_ops);

	ld = devm_lcd_device_register(&spi->dev, "s6e63m0", &spi->dev, lcd,

				&s6e63m0_lcd_ops);

	if (IS_ERR(ld))

		return PTR_ERR(ld);
@@ -751,12 +752,11 @@ static int s6e63m0_probe(struct spi_device *spi) 
	props.type = BACKLIGHT_RAW;

	props.max_brightness = MAX_BRIGHTNESS;



	bd = backlight_device_register("s6e63m0bl-bl", &spi->dev, lcd,

		&s6e63m0_backlight_ops, &props);

	if (IS_ERR(bd)) {

		ret =  PTR_ERR(bd);

		goto out_lcd_unregister;

	}

	bd = devm_backlight_device_register(&spi->dev, "s6e63m0bl-bl",

					&spi->dev, lcd, &s6e63m0_backlight_ops,

					&props);

	if (IS_ERR(bd))

		return PTR_ERR(bd);



	bd->props.brightness = MAX_BRIGHTNESS;

	lcd->bd = bd;
@@ -798,10 +798,6 @@ static int s6e63m0_probe(struct spi_device *spi) 
	dev_info(&spi->dev, "s6e63m0 panel driver has been probed.\n");



	return 0;



out_lcd_unregister:

	lcd_device_unregister(ld);

	return ret;

}



static int s6e63m0_remove(struct spi_device *spi)
@@ -811,8 +807,6 @@ static int s6e63m0_remove(struct spi_device *spi) 
	s6e63m0_power(lcd, FB_BLANK_POWERDOWN);

	device_remove_file(&spi->dev, &dev_attr_gamma_table);

	device_remove_file(&spi->dev, &dev_attr_gamma_mode);

	backlight_device_unregister(lcd->bd);

	lcd_device_unregister(lcd->ld);



	return 0;

}