aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/backlight/kb3886_bl.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-11-12 18:09:17 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-12 22:09:17 -0500
commitda6537850eb0d54eed44ba686be0f5f83c5c6559 (patch)
treeb9a6b993d0fb2b9b75b0923345f70f0edabdbff7 /drivers/video/backlight/kb3886_bl.c
parentff47201582a5bbe6d14d2004e637351c41f78214 (diff)
backlight: kb3886_bl: 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> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/backlight/kb3886_bl.c')
-rw-r--r--drivers/video/backlight/kb3886_bl.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
index 5bacabb233d6..7592cc25c963 100644
--- a/drivers/video/backlight/kb3886_bl.c
+++ b/drivers/video/backlight/kb3886_bl.c
@@ -150,10 +150,10 @@ static int kb3886bl_probe(struct platform_device *pdev)
150 memset(&props, 0, sizeof(struct backlight_properties)); 150 memset(&props, 0, sizeof(struct backlight_properties));
151 props.type = BACKLIGHT_RAW; 151 props.type = BACKLIGHT_RAW;
152 props.max_brightness = machinfo->max_intensity; 152 props.max_brightness = machinfo->max_intensity;
153 kb3886_backlight_device = backlight_device_register("kb3886-bl", 153 kb3886_backlight_device = devm_backlight_device_register(&pdev->dev,
154 &pdev->dev, NULL, 154 "kb3886-bl", &pdev->dev,
155 &kb3886bl_ops, 155 NULL, &kb3886bl_ops,
156 &props); 156 &props);
157 if (IS_ERR(kb3886_backlight_device)) 157 if (IS_ERR(kb3886_backlight_device))
158 return PTR_ERR(kb3886_backlight_device); 158 return PTR_ERR(kb3886_backlight_device);
159 159
@@ -166,18 +166,8 @@ static int kb3886bl_probe(struct platform_device *pdev)
166 return 0; 166 return 0;
167} 167}
168 168
169static int kb3886bl_remove(struct platform_device *pdev)
170{
171 struct backlight_device *bd = platform_get_drvdata(pdev);
172
173 backlight_device_unregister(bd);
174
175 return 0;
176}
177
178static struct platform_driver kb3886bl_driver = { 169static struct platform_driver kb3886bl_driver = {
179 .probe = kb3886bl_probe, 170 .probe = kb3886bl_probe,
180 .remove = kb3886bl_remove,
181 .driver = { 171 .driver = {
182 .name = "kb3886-bl", 172 .name = "kb3886-bl",
183 .pm = &kb3886bl_pm_ops, 173 .pm = &kb3886bl_pm_ops,