Subject: [merged] backlight-wm831x_bl-use-devm_backlight_device_register.patch removed from -mm tree To: jg1.han@xxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 13 Nov 2013 12:41:28 -0800 The patch titled Subject: backlight: wm831x_bl: use devm_backlight_device_register() has been removed from the -mm tree. Its filename was backlight-wm831x_bl-use-devm_backlight_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: wm831x_bl: use devm_backlight_device_register() Use devm_backlight_device_register() to make cleanup paths simpler, and remove unnecessary remove(). Signed-off-by: Jingoo Han <jg1.han@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/backlight/wm831x_bl.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff -puN drivers/video/backlight/wm831x_bl.c~backlight-wm831x_bl-use-devm_backlight_device_register drivers/video/backlight/wm831x_bl.c --- a/drivers/video/backlight/wm831x_bl.c~backlight-wm831x_bl-use-devm_backlight_device_register +++ a/drivers/video/backlight/wm831x_bl.c @@ -195,8 +195,8 @@ static int wm831x_backlight_probe(struct memset(&props, 0, sizeof(props)); props.type = BACKLIGHT_RAW; props.max_brightness = max_isel; - bl = backlight_device_register("wm831x", &pdev->dev, data, - &wm831x_backlight_ops, &props); + bl = devm_backlight_device_register(&pdev->dev, "wm831x", &pdev->dev, + data, &wm831x_backlight_ops, &props); if (IS_ERR(bl)) { dev_err(&pdev->dev, "failed to register backlight\n"); return PTR_ERR(bl); @@ -214,21 +214,12 @@ static int wm831x_backlight_probe(struct return 0; } -static int wm831x_backlight_remove(struct platform_device *pdev) -{ - struct backlight_device *bl = platform_get_drvdata(pdev); - - backlight_device_unregister(bl); - return 0; -} - static struct platform_driver wm831x_backlight_driver = { .driver = { .name = "wm831x-backlight", .owner = THIS_MODULE, }, .probe = wm831x_backlight_probe, - .remove = wm831x_backlight_remove, }; module_platform_driver(wm831x_backlight_driver); _ 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