aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-11-12 18:09:22 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-12 22:09:18 -0500
commit75d4baec9becbf1ed9c8804bd94004622f38cb11 (patch)
treecdf1b79313a629cf4f928007477bd177522d4d22
parent18d9dbce468135c07ab57d2a53b406b9d1e05f18 (diff)
backlight: pandora_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/pandora_bl.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/video/backlight/pandora_bl.c b/drivers/video/backlight/pandora_bl.c
index 633b0a22fd64..2098c5d6efb9 100644
--- a/drivers/video/backlight/pandora_bl.c
+++ b/drivers/video/backlight/pandora_bl.c
@@ -120,8 +120,8 @@ static int pandora_backlight_probe(struct platform_device *pdev)
120 memset(&props, 0, sizeof(props)); 120 memset(&props, 0, sizeof(props));
121 props.max_brightness = MAX_USER_VALUE; 121 props.max_brightness = MAX_USER_VALUE;
122 props.type = BACKLIGHT_RAW; 122 props.type = BACKLIGHT_RAW;
123 bl = backlight_device_register(pdev->name, &pdev->dev, 123 bl = devm_backlight_device_register(&pdev->dev, pdev->name, &pdev->dev,
124 NULL, &pandora_backlight_ops, &props); 124 NULL, &pandora_backlight_ops, &props);
125 if (IS_ERR(bl)) { 125 if (IS_ERR(bl)) {
126 dev_err(&pdev->dev, "failed to register backlight\n"); 126 dev_err(&pdev->dev, "failed to register backlight\n");
127 return PTR_ERR(bl); 127 return PTR_ERR(bl);
@@ -145,20 +145,12 @@ static int pandora_backlight_probe(struct platform_device *pdev)
145 return 0; 145 return 0;
146} 146}
147 147
148static int pandora_backlight_remove(struct platform_device *pdev)
149{
150 struct backlight_device *bl = platform_get_drvdata(pdev);
151 backlight_device_unregister(bl);
152 return 0;
153}
154
155static struct platform_driver pandora_backlight_driver = { 148static struct platform_driver pandora_backlight_driver = {
156 .driver = { 149 .driver = {
157 .name = "pandora-backlight", 150 .name = "pandora-backlight",
158 .owner = THIS_MODULE, 151 .owner = THIS_MODULE,
159 }, 152 },
160 .probe = pandora_backlight_probe, 153 .probe = pandora_backlight_probe,
161 .remove = pandora_backlight_remove,
162}; 154};
163 155
164module_platform_driver(pandora_backlight_driver); 156module_platform_driver(pandora_backlight_driver);