Commit 9828eb09 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

backlight: ili9320: use devm_ functions 



The devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc of these functions.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 06c96f18

drivers/video/backlight/ili9320.c

+2 −7
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ int __devinit ili9320_probe_spi(struct spi_device *spi, 


	/* allocate and initialse our state */



	ili = kzalloc(sizeof(struct ili9320), GFP_KERNEL);

	ili = devm_kzalloc(&spi->dev, sizeof(struct ili9320), GFP_KERNEL);

	if (ili == NULL) {

		dev_err(dev, "no memory for device\n");

		return -ENOMEM;
@@ -240,8 +240,7 @@ int __devinit ili9320_probe_spi(struct spi_device *spi, 
	lcd = lcd_device_register("ili9320", dev, ili, &ili9320_ops);

	if (IS_ERR(lcd)) {

		dev_err(dev, "failed to register lcd device\n");

		ret = PTR_ERR(lcd);

		goto err_free;

		return PTR_ERR(lcd);

	}



	ili->lcd = lcd;
@@ -259,9 +258,6 @@ int __devinit ili9320_probe_spi(struct spi_device *spi, 
 err_unregister:

	lcd_device_unregister(lcd);



 err_free:

	kfree(ili);



	return ret;

}
@@ -272,7 +268,6 @@ int __devexit ili9320_remove(struct ili9320 *ili) 
	ili9320_power(ili, FB_BLANK_POWERDOWN);



	lcd_device_unregister(ili->lcd);

	kfree(ili);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE