Commit b7e69add authored by Damien Cassou's avatar Damien Cassou Committed by Florian Tobias Schandinat

drivers/video/bf54x-lq043fb.c: use devm_ functions

The various devm_ functions allocate memory that is released when a driver
detaches. This patch replaces the use of kzalloc by devm_kzalloc.
Signed-off-by: default avatarDamien Cassou <damien.cassou@lifl.fr>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent b2ca7f4d
...@@ -601,7 +601,8 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev) ...@@ -601,7 +601,8 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
fbinfo->fbops = &bfin_bf54x_fb_ops; fbinfo->fbops = &bfin_bf54x_fb_ops;
fbinfo->pseudo_palette = kzalloc(sizeof(u32) * 16, GFP_KERNEL); fbinfo->pseudo_palette = devm_kzalloc(&pdev->dev, sizeof(u32) * 16,
GFP_KERNEL);
if (!fbinfo->pseudo_palette) { if (!fbinfo->pseudo_palette) {
printk(KERN_ERR DRIVER_NAME printk(KERN_ERR DRIVER_NAME
"Fail to allocate pseudo_palette\n"); "Fail to allocate pseudo_palette\n");
...@@ -616,7 +617,7 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev) ...@@ -616,7 +617,7 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
"Fail to allocate colormap (%d entries)\n", "Fail to allocate colormap (%d entries)\n",
BFIN_LCD_NBR_PALETTE_ENTRIES); BFIN_LCD_NBR_PALETTE_ENTRIES);
ret = -EFAULT; ret = -EFAULT;
goto out5; goto out4;
} }
if (request_ports(info)) { if (request_ports(info)) {
...@@ -671,8 +672,6 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev) ...@@ -671,8 +672,6 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
free_ports(info); free_ports(info);
out6: out6:
fb_dealloc_cmap(&fbinfo->cmap); fb_dealloc_cmap(&fbinfo->cmap);
out5:
kfree(fbinfo->pseudo_palette);
out4: out4:
dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer, dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
info->dma_handle); info->dma_handle);
...@@ -699,7 +698,6 @@ static int __devexit bfin_bf54x_remove(struct platform_device *pdev) ...@@ -699,7 +698,6 @@ static int __devexit bfin_bf54x_remove(struct platform_device *pdev)
dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer, dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
info->dma_handle); info->dma_handle);
kfree(fbinfo->pseudo_palette);
fb_dealloc_cmap(&fbinfo->cmap); fb_dealloc_cmap(&fbinfo->cmap);
#ifndef NO_BL_SUPPORT #ifndef NO_BL_SUPPORT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment