fbdev: sh_mobile_hdmi: Use devm_kzalloc()
Use devm_kzalloc() instead of kzalloc() in order to be free automatically. This makes cleanup paths more simple. Signed-off-by: Sangjung Woo <sangjung.woo@samsung.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
parent
55be310892
commit
4d26ec5ddf
1 changed files with 2 additions and 5 deletions
|
@ -1290,7 +1290,7 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
hdmi = kzalloc(sizeof(*hdmi), GFP_KERNEL);
|
hdmi = devm_kzalloc(&pdev->dev, sizeof(*hdmi), GFP_KERNEL);
|
||||||
if (!hdmi) {
|
if (!hdmi) {
|
||||||
dev_err(&pdev->dev, "Cannot allocate device data\n");
|
dev_err(&pdev->dev, "Cannot allocate device data\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
@ -1304,7 +1304,7 @@ static int __init sh_hdmi_probe(struct platform_device *pdev)
|
||||||
if (IS_ERR(hdmi->hdmi_clk)) {
|
if (IS_ERR(hdmi->hdmi_clk)) {
|
||||||
ret = PTR_ERR(hdmi->hdmi_clk);
|
ret = PTR_ERR(hdmi->hdmi_clk);
|
||||||
dev_err(&pdev->dev, "Unable to get clock: %d\n", ret);
|
dev_err(&pdev->dev, "Unable to get clock: %d\n", ret);
|
||||||
goto egetclk;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* select register access functions */
|
/* select register access functions */
|
||||||
|
@ -1407,8 +1407,6 @@ ereqreg:
|
||||||
clk_disable(hdmi->hdmi_clk);
|
clk_disable(hdmi->hdmi_clk);
|
||||||
erate:
|
erate:
|
||||||
clk_put(hdmi->hdmi_clk);
|
clk_put(hdmi->hdmi_clk);
|
||||||
egetclk:
|
|
||||||
kfree(hdmi);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -1433,7 +1431,6 @@ static int __exit sh_hdmi_remove(struct platform_device *pdev)
|
||||||
iounmap(hdmi->htop1);
|
iounmap(hdmi->htop1);
|
||||||
iounmap(hdmi->base);
|
iounmap(hdmi->base);
|
||||||
release_mem_region(res->start, resource_size(res));
|
release_mem_region(res->start, resource_size(res));
|
||||||
kfree(hdmi);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue