iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backlight: ili9320: use devm_lcd_device_register()

Browse Source 
Use 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>
This commit is contained in:
Jingoo Han 2013-11-12 15:09:27 -08:00 committed by Linus Torvalds
parent a7e9e3ffd7
commit 5690378efa
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/video/backlight/ili9320.c
View File

@ -235,7 +235,8 @@ int ili9320_probe_spi(struct spi_device *spi,
ili9320_setup_spi(ili, spi); ili9320_setup_spi(ili, spi);
lcd = lcd_device_register("ili9320", dev, ili, &ili9320_ops); lcd = devm_lcd_device_register(&spi->dev, "ili9320", dev, ili,
&ili9320_ops);
if (IS_ERR(lcd)) { if (IS_ERR(lcd)) {
dev_err(dev, "failed to register lcd device\n"); dev_err(dev, "failed to register lcd device\n");
return PTR_ERR(lcd); return PTR_ERR(lcd);
@ -248,24 +249,16 @@ int ili9320_probe_spi(struct spi_device *spi,
ret = ili9320_power(ili, FB_BLANK_UNBLANK); ret = ili9320_power(ili, FB_BLANK_UNBLANK);
if (ret != 0) { if (ret != 0) {
dev_err(dev, "failed to set lcd power state\n"); dev_err(dev, "failed to set lcd power state\n");
goto err_unregister; return ret;
} }
return 0; return 0;
err_unregister:
lcd_device_unregister(lcd);
return ret;
} }
EXPORT_SYMBOL_GPL(ili9320_probe_spi); EXPORT_SYMBOL_GPL(ili9320_probe_spi);
int ili9320_remove(struct ili9320 *ili) int ili9320_remove(struct ili9320 *ili)
{ {
ili9320_power(ili, FB_BLANK_POWERDOWN); ili9320_power(ili, FB_BLANK_POWERDOWN);
lcd_device_unregister(ili->lcd);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(ili9320_remove); EXPORT_SYMBOL_GPL(ili9320_remove);