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 16/22] backlight: lp855x: use devm_backlight_device_register()
Date: Tue, 24 Sep 2013 18:17:17 +0900 [thread overview]
Message-ID: <005601ceb906$dd1a6540$974f2fc0$%han@samsung.com> (raw)
In-Reply-To: <004701ceb905$03e8da50$0bba8ef0$%han@samsung.com>
Use devm_backlight_device_register() to make cleanup paths simpler.
Also, unnecessary lp855x_backlight_unregister() is removed.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/video/backlight/lp855x_bl.c | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
index 57f005a..cae80d5 100644
--- a/drivers/video/backlight/lp855x_bl.c
+++ b/drivers/video/backlight/lp855x_bl.c
@@ -300,7 +300,7 @@ static int lp855x_backlight_register(struct lp855x *lp)
props.brightness = pdata->initial_brightness;
- bl = backlight_device_register(name, lp->dev, lp,
+ bl = devm_backlight_device_register(lp->dev, name, lp->dev, lp,
&lp855x_bl_ops, &props);
if (IS_ERR(bl))
return PTR_ERR(bl);
@@ -310,12 +310,6 @@ static int lp855x_backlight_register(struct lp855x *lp)
return 0;
}
-static void lp855x_backlight_unregister(struct lp855x *lp)
-{
- if (lp->bl)
- backlight_device_unregister(lp->bl);
-}
-
static ssize_t lp855x_get_chip_id(struct device *dev,
struct device_attribute *attr, char *buf)
{
@@ -439,29 +433,24 @@ static int lp855x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
ret = lp855x_configure(lp);
if (ret) {
dev_err(lp->dev, "device config err: %d", ret);
- goto err_dev;
+ return ret;
}
ret = lp855x_backlight_register(lp);
if (ret) {
dev_err(lp->dev,
"failed to register backlight. err: %d\n", ret);
- goto err_dev;
+ return ret;
}
ret = sysfs_create_group(&lp->dev->kobj, &lp855x_attr_group);
if (ret) {
dev_err(lp->dev, "failed to register sysfs. err: %d\n", ret);
- goto err_sysfs;
+ return ret;
}
backlight_update_status(lp->bl);
return 0;
-
-err_sysfs:
- lp855x_backlight_unregister(lp);
-err_dev:
- return ret;
}
static int lp855x_remove(struct i2c_client *cl)
@@ -471,7 +460,6 @@ static int lp855x_remove(struct i2c_client *cl)
lp->bl->props.brightness = 0;
backlight_update_status(lp->bl);
sysfs_remove_group(&lp->dev->kobj, &lp855x_attr_group);
- lp855x_backlight_unregister(lp);
return 0;
}
--
1.7.10.4
next prev parent reply other threads:[~2013-09-24 9:17 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 ` [PATCH 06/22] backlight: as3711_bl: " Jingoo Han
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 ` Jingoo Han [this message]
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='005601ceb906$dd1a6540$974f2fc0$%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®