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

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

drivers/video/backlight: 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>
Cc: Michael 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 1107d40a

drivers/video/backlight/88pm860x_bl.c

+2 −6
Original line number Diff line number Diff line
@@ -187,7 +187,8 @@ static int pm860x_backlight_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	data = kzalloc(sizeof(struct pm860x_backlight_data), GFP_KERNEL);

	data = devm_kzalloc(&pdev->dev, sizeof(struct pm860x_backlight_data),

			    GFP_KERNEL);

	if (data == NULL)

		return -ENOMEM;

	strncpy(name, res->name, MFD_NAME_SIZE);
@@ -200,7 +201,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev) 
	data->port = pdata->flags;

	if (data->port < 0) {

		dev_err(&pdev->dev, "wrong platform data is assigned");

		kfree(data);

		return -EINVAL;

	}
@@ -211,7 +211,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev) 
					&pm860x_backlight_ops, &props);

	if (IS_ERR(bl)) {

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

		kfree(data);

		return PTR_ERR(bl);

	}

	bl->props.brightness = MAX_BRIGHTNESS;
@@ -247,17 +246,14 @@ static int pm860x_backlight_probe(struct platform_device *pdev) 
	return 0;

out:

	backlight_device_unregister(bl);

	kfree(data);

	return ret;

}



static int pm860x_backlight_remove(struct platform_device *pdev)

{

	struct backlight_device *bl = platform_get_drvdata(pdev);

	struct pm860x_backlight_data *data = bl_get_data(bl);



	backlight_device_unregister(bl);

	kfree(data);

	return 0;

}

drivers/video/backlight/aat2870_bl.c

+4 −5
Original line number Diff line number Diff line
@@ -145,7 +145,9 @@ static int aat2870_bl_probe(struct platform_device *pdev) 
		goto out;

	}



	aat2870_bl = kzalloc(sizeof(struct aat2870_bl_driver_data), GFP_KERNEL);

	aat2870_bl = devm_kzalloc(&pdev->dev,

				  sizeof(struct aat2870_bl_driver_data),

				  GFP_KERNEL);

	if (!aat2870_bl) {

		dev_err(&pdev->dev,

			"Failed to allocate memory for aat2870 backlight\n");
@@ -162,7 +164,7 @@ static int aat2870_bl_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev,

			"Failed allocate memory for backlight device\n");

		ret = PTR_ERR(bd);

		goto out_kfree;

		goto out;

	}



	aat2870_bl->pdev = pdev;
@@ -199,8 +201,6 @@ static int aat2870_bl_probe(struct platform_device *pdev) 


out_bl_dev_unregister:

	backlight_device_unregister(bd);

out_kfree:

	kfree(aat2870_bl);

out:

	return ret;

}
@@ -215,7 +215,6 @@ static int aat2870_bl_remove(struct platform_device *pdev) 
	backlight_update_status(bd);



	backlight_device_unregister(bd);

	kfree(aat2870_bl);



	return 0;

}

drivers/video/backlight/cr_bllcd.c

+1 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static int cr_backlight_probe(struct platform_device *pdev) 
			      &gpio_bar);

	gpio_bar &= ~0x3F;



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

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

	if (!crp) {

		lcd_device_unregister(ldp);

		backlight_device_unregister(bdp);
@@ -243,7 +243,6 @@ static int cr_backlight_remove(struct platform_device *pdev) 
	backlight_device_unregister(crp->cr_backlight_device);

	lcd_device_unregister(crp->cr_lcd_device);

	pci_dev_put(lpc_dev);

	kfree(crp);



	return 0;

}

drivers/video/backlight/da903x_bl.c

+1 −5
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static int da903x_backlight_probe(struct platform_device *pdev) 
	struct backlight_properties props;

	int max_brightness;



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

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

	if (data == NULL)

		return -ENOMEM;
@@ -124,7 +124,6 @@ static int da903x_backlight_probe(struct platform_device *pdev) 
	default:

		dev_err(&pdev->dev, "invalid backlight device ID(%d)\n",

				pdev->id);

		kfree(data);

		return -EINVAL;

	}
@@ -143,7 +142,6 @@ static int da903x_backlight_probe(struct platform_device *pdev) 
				       &da903x_backlight_ops, &props);

	if (IS_ERR(bl)) {

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

		kfree(data);

		return PTR_ERR(bl);

	}
@@ -157,10 +155,8 @@ static int da903x_backlight_probe(struct platform_device *pdev) 
static int da903x_backlight_remove(struct platform_device *pdev)

{

	struct backlight_device *bl = platform_get_drvdata(pdev);

	struct da903x_backlight_data *data = bl_get_data(bl);



	backlight_device_unregister(bl);

	kfree(data);

	return 0;

}

drivers/video/backlight/max8925_bl.c

+2 −5
Original line number Diff line number Diff line
@@ -129,7 +129,8 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	data = kzalloc(sizeof(struct max8925_backlight_data), GFP_KERNEL);

	data = devm_kzalloc(&pdev->dev, sizeof(struct max8925_backlight_data),

			    GFP_KERNEL);

	if (data == NULL)

		return -ENOMEM;

	strncpy(name, res->name, MAX8925_NAME_SIZE);
@@ -143,7 +144,6 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev) 
					&max8925_backlight_ops, &props);

	if (IS_ERR(bl)) {

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

		kfree(data);

		return PTR_ERR(bl);

	}

	bl->props.brightness = MAX_BRIGHTNESS;
@@ -165,17 +165,14 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev) 
	return 0;

out:

	backlight_device_unregister(bl);

	kfree(data);

	return ret;

}



static int __devexit max8925_backlight_remove(struct platform_device *pdev)

{

	struct backlight_device *bl = platform_get_drvdata(pdev);

	struct max8925_backlight_data *data = bl_get_data(bl);



	backlight_device_unregister(bl);

	kfree(data);

	return 0;

}