From: Jingoo Han <jg1.han@samsung.com>
To: "'Andrew Morton'" <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org,
"'Richard Purdie'" <rpurdie@rpsys.net>,
"'Jingoo Han'" <jg1.han@samsung.com>
Subject: [PATCH 06/22] backlight: as3711_bl: use devm_backlight_device_register()
Date: Tue, 24 Sep 2013 18:09:05 +0900 [thread overview]
Message-ID: <004c01ceb905$b853fc90$28fbf5b0$%han@samsung.com> (raw)
In-Reply-To: <004701ceb905$03e8da50$0bba8ef0$%han@samsung.com>
Use devm_backlight_device_register() to make cleanup paths simpler,
and remove unnecessary remove().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/as3711_bl.c | 26 +++++---------------------
1 file changed, 5 insertions(+), 21 deletions(-)
diff --git a/drivers/video/backlight/as3711_bl.c b/drivers/video/backlight/as3711_bl.c
index 123887c..bb1fc45 100644
--- a/drivers/video/backlight/as3711_bl.c
+++ b/drivers/video/backlight/as3711_bl.c
@@ -240,7 +240,8 @@ static int as3711_bl_register(struct platform_device *pdev,
/* max tuning I = 31uA for voltage- and 38250uA for current-feedback */
props.max_brightness = max_brightness;
- bl = backlight_device_register(su->type == AS3711_BL_SU1 ?
+ bl = devm_backlight_device_register(&pdev->dev,
+ su->type == AS3711_BL_SU1 ?
"as3711-su1" : "as3711-su2",
&pdev->dev, su,
&as3711_bl_ops, &props);
@@ -432,8 +433,7 @@ static int as3711_backlight_probe(struct platform_device *pdev)
case AS3711_SU2_LX_SD4:
break;
default:
- ret = -EINVAL;
- goto esu2;
+ return -EINVAL;
}
switch (pdata->su2_feedback) {
@@ -447,8 +447,7 @@ static int as3711_backlight_probe(struct platform_device *pdev)
max_brightness = min(pdata->su2_max_uA / 150, 255);
break;
default:
- ret = -EINVAL;
- goto esu2;
+ return -EINVAL;
}
ret = as3711_bl_init_su2(supply);
@@ -457,26 +456,12 @@ static int as3711_backlight_probe(struct platform_device *pdev)
ret = as3711_bl_register(pdev, max_brightness, su);
if (ret < 0)
- goto esu2;
+ return ret;
}
platform_set_drvdata(pdev, supply);
return 0;
-
-esu2:
- backlight_device_unregister(supply->su1.bl);
- return ret;
-}
-
-static int as3711_backlight_remove(struct platform_device *pdev)
-{
- struct as3711_bl_supply *supply = platform_get_drvdata(pdev);
-
- backlight_device_unregister(supply->su1.bl);
- backlight_device_unregister(supply->su2.bl);
-
- return 0;
}
static struct platform_driver as3711_backlight_driver = {
@@ -485,7 +470,6 @@ static struct platform_driver as3711_backlight_driver = {
.owner = THIS_MODULE,
},
.probe = as3711_backlight_probe,
- .remove = as3711_backlight_remove,
};
module_platform_driver(as3711_backlight_driver);
--
1.7.10.4
next prev parent reply other threads:[~2013-09-24 9:09 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-24 9:04 [PATCH 01/22] backlight: 88pm860x_bl: " Jingoo Han
2013-09-24 9:05 ` [PATCH 02/22] backlight: aat2870: " Jingoo Han
2013-09-24 9:06 ` [PATCH 03/22] backlight: adp5520: " Jingoo Han
2013-09-24 9:07 ` [PATCH 04/22] backlight: adp8860: " Jingoo Han
2013-09-24 9:07 ` [PATCH 05/22] backlight: adp8870: " Jingoo Han
2013-09-24 9:09 ` Jingoo Han [this message]
2013-09-24 9:09 ` [PATCH 07/22] backlight: atmel-pwm-bl: " Jingoo Han
2013-09-24 9:10 ` [PATCH 08/22] backlight: bd6107: " Jingoo Han
2013-09-24 9:11 ` [PATCH 09/22] backlight: da903x_bl: " Jingoo Han
2013-09-24 9:13 ` [PATCH 10/22] backlight: da9052_bl: " Jingoo Han
2013-09-24 9:14 ` [PATCH 11/22] backlight: ep93xx: " Jingoo Han
2013-09-24 9:14 ` [PATCH 12/22] backlight: generic_bl: " Jingoo Han
2013-09-24 9:15 ` [PATCH 13/22] backlight: gpio_backlight: " Jingoo Han
2013-09-24 9:16 ` [PATCH 14/22] backlight: kb3886_bl: " Jingoo Han
2013-09-24 9:16 ` [PATCH 15/22] backlight: lm3533_bl: " Jingoo Han
2013-09-24 9:17 ` [PATCH 16/22] backlight: lp855x: " Jingoo Han
2013-09-24 9:17 ` [PATCH 17/22] backlight: lv5207lp: " Jingoo Han
2013-09-24 9:18 ` [PATCH 18/22] backlight: max8925_bl: " Jingoo Han
2013-09-24 9:18 ` [PATCH 19/22] backlight: pandora_bl: " Jingoo Han
2013-09-24 9:19 ` [PATCH 20/22] backlight: pcf50633: " Jingoo Han
2013-09-24 9:20 ` [PATCH 21/22] backlight: tps65217_bl: " Jingoo Han
2013-09-24 9:20 ` [PATCH 22/22] backlight: wm831x_bl: " Jingoo Han
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='004c01ceb905$b853fc90$28fbf5b0$%han@samsung.com' \
--to=jg1.han@samsung.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rpurdie@rpsys.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®