mirror of
https://github.com/torvalds/linux.git
synced 2024-12-16 08:02:17 +00:00
backlight: 88pm860x_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>
This commit is contained in:
parent
c512794cad
commit
f829c9ef82
@ -243,7 +243,7 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
|
||||
memset(&props, 0, sizeof(struct backlight_properties));
|
||||
props.type = BACKLIGHT_RAW;
|
||||
props.max_brightness = MAX_BRIGHTNESS;
|
||||
bl = backlight_device_register(name, &pdev->dev, data,
|
||||
bl = devm_backlight_device_register(&pdev->dev, name, &pdev->dev, data,
|
||||
&pm860x_backlight_ops, &props);
|
||||
if (IS_ERR(bl)) {
|
||||
dev_err(&pdev->dev, "failed to register backlight\n");
|
||||
@ -256,21 +256,10 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
|
||||
/* read current backlight */
|
||||
ret = pm860x_backlight_get_brightness(bl);
|
||||
if (ret < 0)
|
||||
goto out_brt;
|
||||
return ret;
|
||||
|
||||
backlight_update_status(bl);
|
||||
return 0;
|
||||
out_brt:
|
||||
backlight_device_unregister(bl);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int pm860x_backlight_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct backlight_device *bl = platform_get_drvdata(pdev);
|
||||
|
||||
backlight_device_unregister(bl);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver pm860x_backlight_driver = {
|
||||
@ -279,7 +268,6 @@ static struct platform_driver pm860x_backlight_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = pm860x_backlight_probe,
|
||||
.remove = pm860x_backlight_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(pm860x_backlight_driver);
|
||||
|
Loading…
Reference in New Issue
Block a user