backlight: ltv350qv: use devm_ functions
authorJingoo Han <jg1.han@samsung.com>
Tue, 29 May 2012 22:07:24 +0000 (15:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 May 2012 23:22:31 +0000 (16:22 -0700)
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: Haavard Skinnemoen <hskinnemoen@gmail.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>
drivers/video/backlight/ltv350qv.c

index d23922ff3354a5ac631315901fdf025ba84133e7..6c0f1ac0d32a93d9f278ad21155d2ca9d81b22d9 100644 (file)
@@ -232,23 +232,20 @@ static int __devinit ltv350qv_probe(struct spi_device *spi)
        struct lcd_device *ld;
        int ret;
 
        struct lcd_device *ld;
        int ret;
 
-       lcd = kzalloc(sizeof(struct ltv350qv), GFP_KERNEL);
+       lcd = devm_kzalloc(&spi->dev, sizeof(struct ltv350qv), GFP_KERNEL);
        if (!lcd)
                return -ENOMEM;
 
        lcd->spi = spi;
        lcd->power = FB_BLANK_POWERDOWN;
        if (!lcd)
                return -ENOMEM;
 
        lcd->spi = spi;
        lcd->power = FB_BLANK_POWERDOWN;
-       lcd->buffer = kzalloc(8, GFP_KERNEL);
-       if (!lcd->buffer) {
-               ret = -ENOMEM;
-               goto out_free_lcd;
-       }
+       lcd->buffer = devm_kzalloc(&spi->dev, 8, GFP_KERNEL);
+       if (!lcd->buffer)
+               return -ENOMEM;
 
        ld = lcd_device_register("ltv350qv", &spi->dev, lcd, &ltv_ops);
 
        ld = lcd_device_register("ltv350qv", &spi->dev, lcd, &ltv_ops);
-       if (IS_ERR(ld)) {
-               ret = PTR_ERR(ld);
-               goto out_free_buffer;
-       }
+       if (IS_ERR(ld))
+               return PTR_ERR(ld);
+
        lcd->ld = ld;
 
        ret = ltv350qv_power(lcd, FB_BLANK_UNBLANK);
        lcd->ld = ld;
 
        ret = ltv350qv_power(lcd, FB_BLANK_UNBLANK);
@@ -261,10 +258,6 @@ static int __devinit ltv350qv_probe(struct spi_device *spi)
 
 out_unregister:
        lcd_device_unregister(ld);
 
 out_unregister:
        lcd_device_unregister(ld);
-out_free_buffer:
-       kfree(lcd->buffer);
-out_free_lcd:
-       kfree(lcd);
        return ret;
 }
 
        return ret;
 }
 
@@ -274,8 +267,6 @@ static int __devexit ltv350qv_remove(struct spi_device *spi)
 
        ltv350qv_power(lcd, FB_BLANK_POWERDOWN);
        lcd_device_unregister(lcd->ld);
 
        ltv350qv_power(lcd, FB_BLANK_POWERDOWN);
        lcd_device_unregister(lcd->ld);
-       kfree(lcd->buffer);
-       kfree(lcd);
 
        return 0;
 }
 
        return 0;
 }