Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

authored by

Jingoo Han and committed by
Linus Torvalds
7a78e1b2 ebc41e43

+6 -15
+6 -15
drivers/video/backlight/ld9040.c
··· 716 716 return ret; 717 717 } 718 718 719 - ld = lcd_device_register("ld9040", &spi->dev, lcd, &ld9040_lcd_ops); 719 + ld = devm_lcd_device_register(&spi->dev, "ld9040", &spi->dev, lcd, 720 + &ld9040_lcd_ops); 720 721 if (IS_ERR(ld)) 721 722 return PTR_ERR(ld); 722 723 ··· 727 726 props.type = BACKLIGHT_RAW; 728 727 props.max_brightness = MAX_BRIGHTNESS; 729 728 730 - bd = backlight_device_register("ld9040-bl", &spi->dev, 731 - lcd, &ld9040_backlight_ops, &props); 732 - if (IS_ERR(bd)) { 733 - ret = PTR_ERR(bd); 734 - goto out_unregister_lcd; 735 - } 729 + bd = devm_backlight_device_register(&spi->dev, "ld9040-bl", &spi->dev, 730 + lcd, &ld9040_backlight_ops, &props); 731 + if (IS_ERR(bd)) 732 + return PTR_ERR(bd); 736 733 737 734 bd->props.brightness = MAX_BRIGHTNESS; 738 735 lcd->bd = bd; ··· 756 757 757 758 dev_info(&spi->dev, "ld9040 panel driver has been probed.\n"); 758 759 return 0; 759 - 760 - out_unregister_lcd: 761 - lcd_device_unregister(lcd->ld); 762 - 763 - return ret; 764 760 } 765 761 766 762 static int ld9040_remove(struct spi_device *spi) ··· 763 769 struct ld9040 *lcd = spi_get_drvdata(spi); 764 770 765 771 ld9040_power(lcd, FB_BLANK_POWERDOWN); 766 - backlight_device_unregister(lcd->bd); 767 - lcd_device_unregister(lcd->ld); 768 - 769 772 return 0; 770 773 } 771 774