Skip to content

Commit

Permalink
backlight: ili9320: use devm_ functions
Browse files Browse the repository at this point in the history
The devm_ functions allocate memory that is released when a driver
detaches.  This patch uses devm_kzalloc of these functions.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jingoo Han authored and Linus Torvalds committed May 29, 2012
1 parent 06c96f1 commit 9828eb0
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/video/backlight/ili9320.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
}

Expand All @@ -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;
}
Expand Down

0 comments on commit 9828eb0

Please sign in to comment.