Subject: [merged] backlight-adp5520-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:40:50 -0800 The patch titled Subject: backlight: adp5520: use devm_backlight_device_register() has been removed from the -mm tree. Its filename was backlight-adp5520-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: adp5520: use devm_backlight_device_register() Use devm_backlight_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/adp5520_bl.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff -puN drivers/video/backlight/adp5520_bl.c~backlight-adp5520-use-devm_backlight_device_register drivers/video/backlight/adp5520_bl.c --- a/drivers/video/backlight/adp5520_bl.c~backlight-adp5520-use-devm_backlight_device_register +++ a/drivers/video/backlight/adp5520_bl.c @@ -312,8 +312,9 @@ static int adp5520_bl_probe(struct platf memset(&props, 0, sizeof(struct backlight_properties)); props.type = BACKLIGHT_RAW; props.max_brightness = ADP5020_MAX_BRIGHTNESS; - bl = backlight_device_register(pdev->name, data->master, data, - &adp5520_bl_ops, &props); + bl = devm_backlight_device_register(&pdev->dev, pdev->name, + data->master, data, &adp5520_bl_ops, + &props); if (IS_ERR(bl)) { dev_err(&pdev->dev, "failed to register backlight\n"); return PTR_ERR(bl); @@ -326,7 +327,7 @@ static int adp5520_bl_probe(struct platf if (ret) { dev_err(&pdev->dev, "failed to register sysfs\n"); - backlight_device_unregister(bl); + return ret; } platform_set_drvdata(pdev, bl); @@ -347,8 +348,6 @@ static int adp5520_bl_remove(struct plat sysfs_remove_group(&bl->dev.kobj, &adp5520_bl_attr_group); - backlight_device_unregister(bl); - return 0; } _ 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