aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-11-12 18:09:25 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-12 22:09:18 -0500
commitf369e664498c8e73f24d137f5356bb3492917bc2 (patch)
tree00889be9224062384a17c48a51171b37fe5bdc15
parent626d09089f350f876f965c1e6fa4621498213b1e (diff)
backlight: wm831x_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>
-rw-r--r--drivers/video/backlight/wm831x_bl.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c
index 2ccf3206e93f..8b9455e93069 100644
--- a/drivers/video/backlight/wm831x_bl.c
+++ b/drivers/video/backlight/wm831x_bl.c
@@ -195,8 +195,8 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
195 memset(&props, 0, sizeof(props)); 195 memset(&props, 0, sizeof(props));
196 props.type = BACKLIGHT_RAW; 196 props.type = BACKLIGHT_RAW;
197 props.max_brightness = max_isel; 197 props.max_brightness = max_isel;
198 bl = backlight_device_register("wm831x", &pdev->dev, data, 198 bl = devm_backlight_device_register(&pdev->dev, "wm831x", &pdev->dev,
199 &wm831x_backlight_ops, &props); 199 data, &wm831x_backlight_ops, &props);
200 if (IS_ERR(bl)) { 200 if (IS_ERR(bl)) {
201 dev_err(&pdev->dev, "failed to register backlight\n"); 201 dev_err(&pdev->dev, "failed to register backlight\n");
202 return PTR_ERR(bl); 202 return PTR_ERR(bl);
@@ -214,21 +214,12 @@ static int wm831x_backlight_probe(struct platform_device *pdev)
214 return 0; 214 return 0;
215} 215}
216 216
217static int wm831x_backlight_remove(struct platform_device *pdev)
218{
219 struct backlight_device *bl = platform_get_drvdata(pdev);
220
221 backlight_device_unregister(bl);
222 return 0;
223}
224
225static struct platform_driver wm831x_backlight_driver = { 217static struct platform_driver wm831x_backlight_driver = {
226 .driver = { 218 .driver = {
227 .name = "wm831x-backlight", 219 .name = "wm831x-backlight",
228 .owner = THIS_MODULE, 220 .owner = THIS_MODULE,
229 }, 221 },
230 .probe = wm831x_backlight_probe, 222 .probe = wm831x_backlight_probe,
231 .remove = wm831x_backlight_remove,
232}; 223};
233 224
234module_platform_driver(wm831x_backlight_driver); 225module_platform_driver(wm831x_backlight_driver);