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

Commit 050ea48b authored by Julia Lawall's avatar Julia Lawall Committed by Linus Torvalds
Browse files

drivers/video/backlight/adp5520_bl.c: use devm_ functions 



The various devm_ functions allocate memory that is released when a driver
detaches.  This patch uses these functions for data that is allocated in
the probe function of a platform device and is only freed in the remove
function.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Cc: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ce969228

drivers/video/backlight/adp5520_bl.c

+1 −5
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev) 
	struct adp5520_bl *data;

	int ret = 0;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);

	if (data == NULL)

		return -ENOMEM;
@@ -298,7 +298,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev) 


	if (data->pdata  == NULL) {

		dev_err(&pdev->dev, "missing platform data\n");

		kfree(data);

		return -ENODEV;

	}
@@ -314,7 +313,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev) 
				       &adp5520_bl_ops, &props);

	if (IS_ERR(bl)) {

		dev_err(&pdev->dev, "failed to register backlight\n");

		kfree(data);

		return PTR_ERR(bl);

	}
@@ -326,7 +324,6 @@ static int __devinit adp5520_bl_probe(struct platform_device *pdev) 
	if (ret) {

		dev_err(&pdev->dev, "failed to register sysfs\n");

		backlight_device_unregister(bl);

		kfree(data);

	}



	platform_set_drvdata(pdev, bl);
@@ -348,7 +345,6 @@ static int __devexit adp5520_bl_remove(struct platform_device *pdev) 
				&adp5520_bl_attr_group);



	backlight_device_unregister(bl);

	kfree(data);



	return 0;

}