mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-11-01 09:13:37 +00:00
fbdev: imxfb: Convert to devm_kmalloc_array()
No need for manual kfree in the error path and the remove function. Signed-off-by: Yangtao Li <frank.li@vivo.com> Signed-off-by: Helge Deller <deller@gmx.de>
This commit is contained in:
parent
45fcc058a7
commit
55dd7378ba
1 changed files with 2 additions and 3 deletions
|
|
@ -673,7 +673,8 @@ static int imxfb_init_fbinfo(struct platform_device *pdev)
|
||||||
|
|
||||||
pr_debug("%s\n",__func__);
|
pr_debug("%s\n",__func__);
|
||||||
|
|
||||||
info->pseudo_palette = kmalloc_array(16, sizeof(u32), GFP_KERNEL);
|
info->pseudo_palette = devm_kmalloc_array(&pdev->dev, 16,
|
||||||
|
sizeof(u32), GFP_KERNEL);
|
||||||
if (!info->pseudo_palette)
|
if (!info->pseudo_palette)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
|
@ -1044,7 +1045,6 @@ failed_map:
|
||||||
failed_ioremap:
|
failed_ioremap:
|
||||||
failed_getclock:
|
failed_getclock:
|
||||||
failed_of_parse:
|
failed_of_parse:
|
||||||
kfree(info->pseudo_palette);
|
|
||||||
failed_init:
|
failed_init:
|
||||||
framebuffer_release(info);
|
framebuffer_release(info);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
@ -1061,7 +1061,6 @@ static void imxfb_remove(struct platform_device *pdev)
|
||||||
fb_dealloc_cmap(&info->cmap);
|
fb_dealloc_cmap(&info->cmap);
|
||||||
dma_free_wc(&pdev->dev, fbi->map_size, info->screen_buffer,
|
dma_free_wc(&pdev->dev, fbi->map_size, info->screen_buffer,
|
||||||
fbi->map_dma);
|
fbi->map_dma);
|
||||||
kfree(info->pseudo_palette);
|
|
||||||
framebuffer_release(info);
|
framebuffer_release(info);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue