Skip to content

Commit

Permalink
drivers/video/bf54x-lq043fb.c: use devm_ functions
Browse files Browse the repository at this point in the history
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: Damien Cassou <damien.cassou@lifl.fr>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
  • Loading branch information
Damien Cassou authored and Florian Tobias Schandinat committed Aug 23, 2012
1 parent b2ca7f4 commit b7e69ad
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/video/bf54x-lq043fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,8 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)

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) {
printk(KERN_ERR DRIVER_NAME
"Fail to allocate pseudo_palette\n");
Expand All @@ -616,7 +617,7 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
"Fail to allocate colormap (%d entries)\n",
BFIN_LCD_NBR_PALETTE_ENTRIES);
ret = -EFAULT;
goto out5;
goto out4;
}

if (request_ports(info)) {
Expand Down Expand Up @@ -671,8 +672,6 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev)
free_ports(info);
out6:
fb_dealloc_cmap(&fbinfo->cmap);
out5:
kfree(fbinfo->pseudo_palette);
out4:
dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
info->dma_handle);
Expand All @@ -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,
info->dma_handle);

kfree(fbinfo->pseudo_palette);
fb_dealloc_cmap(&fbinfo->cmap);

#ifndef NO_BL_SUPPORT
Expand Down

0 comments on commit b7e69ad

Please sign in to comment.