Subject: [merged] backlight-ili9320-use-devm_lcd_device_register.patch removed from -mm tree To: jg1.han@xxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 13 Nov 2013 12:41:34 -0800 The patch titled Subject: backlight: ili9320: use devm_lcd_device_register() has been removed from the -mm tree. Its filename was backlight-ili9320-use-devm_lcd_device_register.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Jingoo Han <jg1.han@xxxxxxxxxxx> Subject: backlight: ili9320: use devm_lcd_device_register() Use devm_lcd_device_register() to make cleanup paths simpler. Signed-off-by: Jingoo Han <jg1.han@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/backlight/ili9320.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff -puN drivers/video/backlight/ili9320.c~backlight-ili9320-use-devm_lcd_device_register drivers/video/backlight/ili9320.c --- a/drivers/video/backlight/ili9320.c~backlight-ili9320-use-devm_lcd_device_register +++ a/drivers/video/backlight/ili9320.c @@ -235,7 +235,8 @@ int ili9320_probe_spi(struct spi_device 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)) { dev_err(dev, "failed to register lcd device\n"); return PTR_ERR(lcd); @@ -248,24 +249,16 @@ int ili9320_probe_spi(struct spi_device ret = ili9320_power(ili, FB_BLANK_UNBLANK); if (ret != 0) { dev_err(dev, "failed to set lcd power state\n"); - goto err_unregister; + return ret; } return 0; - - err_unregister: - lcd_device_unregister(lcd); - - return ret; } EXPORT_SYMBOL_GPL(ili9320_probe_spi); int ili9320_remove(struct ili9320 *ili) { ili9320_power(ili, FB_BLANK_POWERDOWN); - - lcd_device_unregister(ili->lcd); - return 0; } EXPORT_SYMBOL_GPL(ili9320_remove); _ Patches currently in -mm which might be from jg1.han@xxxxxxxxxxx are origin.patch drivers-block-sx8c-use-module_pci_driver.patch drivers-block-sx8c-remove-unnecessary-pci_set_drvdata.patch linux-next.patch drivers-rtc-rtc-hid-sensor-timec-use-dev_get_platdata.patch w1-w1-gpio-use-dev_get_platdata.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html