UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

backlight: ld9040: 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: Jingoo Han <jg1.han@samsung.com>
Cc: Donghwa Lee <dh09.lee@samsung.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jingoo Han 2012-05-29 15:07:23 -07:00 committed by Linus Torvalds
parent ba4a887ac3
commit 86f6be4fae
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/video/backlight/ld9040.c
View File

@ -707,7 +707,7 @@ static int ld9040_probe(struct spi_device *spi)
struct backlight_device *bd = NULL; struct backlight_device *bd = NULL;
struct backlight_properties props; struct backlight_properties props;
lcd = kzalloc(sizeof(struct ld9040), GFP_KERNEL); lcd = devm_kzalloc(&spi->dev, sizeof(struct ld9040), GFP_KERNEL);
if (!lcd) if (!lcd)
return -ENOMEM; return -ENOMEM;
@ -717,7 +717,7 @@ static int ld9040_probe(struct spi_device *spi)
ret = spi_setup(spi); ret = spi_setup(spi);
if (ret < 0) { if (ret < 0) {
dev_err(&spi->dev, "spi setup failed.\n"); dev_err(&spi->dev, "spi setup failed.\n");
goto out_free_lcd; return ret;
} }
lcd->spi = spi; lcd->spi = spi;
@ -726,7 +726,7 @@ static int ld9040_probe(struct spi_device *spi)
lcd->lcd_pd = spi->dev.platform_data; lcd->lcd_pd = spi->dev.platform_data;
if (!lcd->lcd_pd) { if (!lcd->lcd_pd) {
dev_err(&spi->dev, "platform data is NULL.\n"); dev_err(&spi->dev, "platform data is NULL.\n");
goto out_free_lcd; return -EFAULT;
} }
mutex_init(&lcd->lock); mutex_init(&lcd->lock);
@ -734,13 +734,13 @@ static int ld9040_probe(struct spi_device *spi)
ret = regulator_bulk_get(lcd->dev, ARRAY_SIZE(supplies), supplies); ret = regulator_bulk_get(lcd->dev, ARRAY_SIZE(supplies), supplies);
if (ret) { if (ret) {
dev_err(lcd->dev, "Failed to get regulators: %d\n", ret); dev_err(lcd->dev, "Failed to get regulators: %d\n", ret);
goto out_free_lcd; return ret;
} }
ld = lcd_device_register("ld9040", &spi->dev, lcd, &ld9040_lcd_ops); ld = lcd_device_register("ld9040", &spi->dev, lcd, &ld9040_lcd_ops);
if (IS_ERR(ld)) { if (IS_ERR(ld)) {
ret = PTR_ERR(ld); ret = PTR_ERR(ld);
goto out_free_lcd; goto out_free_regulator;
} }
lcd->ld = ld; lcd->ld = ld;
@ -782,10 +782,9 @@ static int ld9040_probe(struct spi_device *spi)
out_unregister_lcd: out_unregister_lcd:
lcd_device_unregister(lcd->ld); lcd_device_unregister(lcd->ld);
out_free_lcd: out_free_regulator:
regulator_bulk_free(ARRAY_SIZE(supplies), supplies); regulator_bulk_free(ARRAY_SIZE(supplies), supplies);
kfree(lcd);
return ret; return ret;
} }
@ -797,7 +796,6 @@ static int __devexit ld9040_remove(struct spi_device *spi)
backlight_device_unregister(lcd->bd); backlight_device_unregister(lcd->bd);
lcd_device_unregister(lcd->ld); lcd_device_unregister(lcd->ld);
regulator_bulk_free(ARRAY_SIZE(supplies), supplies); regulator_bulk_free(ARRAY_SIZE(supplies), supplies);
kfree(lcd);
return 0; return 0;
} }