Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18d9dbce authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

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: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e924c2aa

drivers/video/backlight/max8925_bl.c

+3 −14
Original line number Diff line number Diff line
@@ -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,19 +189,8 @@ 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;

	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);

	backlight_update_status(bl);

	return 0;

}
@@ -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);