video: sa1100fb: use devm_kzalloc()
authorRussell King <rmk+kernel@armlinux.org.uk>
Tue, 17 Oct 2017 14:01:12 +0000 (16:01 +0200)
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Tue, 17 Oct 2017 14:01:12 +0000 (16:01 +0200)
Use devm_kzalloc() when allocating the private data for the framebuffer
device.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
drivers/video/fbdev/sa1100fb.c

index fc2aaa5aca2347e705c6eb1623ec188b5262e498..05a80e08dcde2346fe9dac8b60ebdb997d7f1122 100644 (file)
@@ -1132,12 +1132,11 @@ static struct sa1100fb_info *sa1100fb_init_fbinfo(struct device *dev)
        struct sa1100fb_info *fbi;
        unsigned i;
 
-       fbi = kmalloc(sizeof(struct sa1100fb_info) + sizeof(u32) * 16,
-                     GFP_KERNEL);
+       fbi = devm_kzalloc(dev, sizeof(struct sa1100fb_info) + sizeof(u32) * 16,
+                          GFP_KERNEL);
        if (!fbi)
                return NULL;
 
-       memset(fbi, 0, sizeof(struct sa1100fb_info));
        fbi->dev = dev;
 
        strcpy(fbi->fb.fix.id, SA1100_NAME);
@@ -1292,7 +1291,6 @@ static int sa1100fb_probe(struct platform_device *pdev)
                iounmap(fbi->base);
        if (fbi->clk)
                clk_put(fbi->clk);
-       kfree(fbi);
        release_mem_region(res->start, resource_size(res));
        return ret;
 }