Subject: [merged] backlight-aat2870-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:48 -0800 The patch titled Subject: backlight: aat2870: use devm_backlight_device_register() has been removed from the -mm tree. Its filename was backlight-aat2870-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: aat2870: 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/aat2870_bl.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff -puN drivers/video/backlight/aat2870_bl.c~backlight-aat2870-use-devm_backlight_device_register drivers/video/backlight/aat2870_bl.c --- a/drivers/video/backlight/aat2870_bl.c~backlight-aat2870-use-devm_backlight_device_register +++ a/drivers/video/backlight/aat2870_bl.c @@ -158,8 +158,9 @@ static int aat2870_bl_probe(struct platf memset(&props, 0, sizeof(struct backlight_properties)); props.type = BACKLIGHT_RAW; - bd = backlight_device_register("aat2870-backlight", &pdev->dev, - aat2870_bl, &aat2870_bl_ops, &props); + bd = devm_backlight_device_register(&pdev->dev, "aat2870-backlight", + &pdev->dev, aat2870_bl, &aat2870_bl_ops, + &props); if (IS_ERR(bd)) { dev_err(&pdev->dev, "Failed allocate memory for backlight device\n"); @@ -194,13 +195,11 @@ static int aat2870_bl_probe(struct platf ret = aat2870_bl_update_status(bd); if (ret < 0) { dev_err(&pdev->dev, "Failed to initialize\n"); - goto out_bl_dev_unregister; + return ret; } return 0; -out_bl_dev_unregister: - backlight_device_unregister(bd); out: return ret; } @@ -214,8 +213,6 @@ static int aat2870_bl_remove(struct plat bd->props.brightness = 0; backlight_update_status(bd); - backlight_device_unregister(bd); - 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