[merged] backlight-gpio_backlight-use-devm_backlight_device_register.patch removed from -mm tree

[merged] backlight-gpio_backlight-use-devm_backlight_device_register.patch removed from -mm tree

[akpm]

Subject: [merged] backlight-gpio_backlight-use-devm_backlight_device_register.patch removed from -mm tree
To: jg1.han@samsung.com,mm-commits@vger.kernel.org
From: akpm@linux-foundation.org
Date: Wed, 13 Nov 2013 12:41:10 -0800


The patch titled
     Subject: backlight: gpio_backlight: use devm_backlight_device_register()
has been removed from the -mm tree.  Its filename was
     backlight-gpio_backlight-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@samsung.com>
Subject: backlight: gpio_backlight: 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@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/video/backlight/gpio_backlight.c |   14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff -puN drivers/video/backlight/gpio_backlight.c~backlight-gpio_backlight-use-devm_backlight_device_register drivers/video/backlight/gpio_backlight.c
--- a/drivers/video/backlight/gpio_backlight.c~backlight-gpio_backlight-use-devm_backlight_device_register
+++ a/drivers/video/backlight/gpio_backlight.c
@@ -95,8 +95,9 @@ static int gpio_backlight_probe(struct p
 	memset(&props, 0, sizeof(props));
 	props.type = BACKLIGHT_RAW;
 	props.max_brightness = 1;
-	bl = backlight_device_register(dev_name(&pdev->dev), &pdev->dev, gbl,
-				       &gpio_backlight_ops, &props);
+	bl = devm_backlight_device_register(&pdev->dev, dev_name(&pdev->dev),
+					&pdev->dev, gbl, &gpio_backlight_ops,
+					&props);
 	if (IS_ERR(bl)) {
 		dev_err(&pdev->dev, "failed to register backlight\n");
 		return PTR_ERR(bl);
@@ -109,21 +110,12 @@ static int gpio_backlight_probe(struct p
 	return 0;
 }
 
-static int gpio_backlight_remove(struct platform_device *pdev)
-{
-	struct backlight_device *bl = platform_get_drvdata(pdev);
-
-	backlight_device_unregister(bl);
-	return 0;
-}