mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 22:51:42 +00:00
backlight: max8925_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
e924c2aadf
commit
18d9dbce46
@ -163,7 +163,8 @@ static int max8925_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("max8925-backlight", &pdev->dev, data,
|
||||
bl = devm_backlight_device_register(&pdev->dev, "max8925-backlight",
|
||||
&pdev->dev, data,
|
||||
&max8925_backlight_ops, &props);
|
||||
if (IS_ERR(bl)) {
|
||||
dev_err(&pdev->dev, "failed to register backlight\n");
|
||||
@ -188,20 +189,9 @@ static int max8925_backlight_probe(struct platform_device *pdev)
|
||||
}
|
||||
ret = max8925_set_bits(chip->i2c, data->reg_mode_cntl, 0xfe, value);
|
||||
if (ret < 0)
|
||||
goto out_brt;
|
||||
return ret;
|
||||
backlight_update_status(bl);
|
||||
return 0;
|
||||
out_brt:
|
||||
backlight_device_unregister(bl);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int max8925_backlight_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct backlight_device *bl = platform_get_drvdata(pdev);
|
||||
|
||||
backlight_device_unregister(bl);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver max8925_backlight_driver = {
|
||||
@ -210,7 +200,6 @@ static struct platform_driver max8925_backlight_driver = {
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = max8925_backlight_probe,
|
||||
.remove = max8925_backlight_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(max8925_backlight_driver);
|
||||
|
Loading…
Reference in New Issue
Block a user