diff options
| author | Sangjung Woo <sangjung.woo@samsung.com> | 2013-10-03 18:04:27 +0400 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-10-09 13:35:43 +0400 |
| commit | 4d26ec5ddf93e7e133e36fd0454b54a3938f7d3c (patch) | |
| tree | 3809976149eacfc1c206fa7d85510107e7fcf0bb /drivers/video/sh_mobile_hdmi.c | |
| parent | 55be31089212898537c13fcf7ddb689f04868b4b (diff) | |
| download | linux-4d26ec5ddf93e7e133e36fd0454b54a3938f7d3c.tar.xz | |
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>
Diffstat (limited to 'drivers/video/sh_mobile_hdmi.c')
| -rw-r--r-- | drivers/video/sh_mobile_hdmi.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c index 45417fa9749b..5e2845b9f3a8 100644 --- a/drivers/video/sh_mobile_hdmi.c +++ b/drivers/video/sh_mobile_hdmi.c @@ -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) { dev_err(&pdev->dev, "Cannot allocate device data\n"); return -ENOMEM; @@ -1304,7 +1304,7 @@ static int __init sh_hdmi_probe(struct platform_device *pdev) if (IS_ERR(hdmi->hdmi_clk)) { ret = PTR_ERR(hdmi->hdmi_clk); dev_err(&pdev->dev, "Unable to get clock: %d\n", ret); - goto egetclk; + return ret; } /* select register access functions */ @@ -1407,8 +1407,6 @@ ereqreg: clk_disable(hdmi->hdmi_clk); erate: clk_put(hdmi->hdmi_clk); -egetclk: - kfree(hdmi); return ret; } @@ -1433,7 +1431,6 @@ static int __exit sh_hdmi_remove(struct platform_device *pdev) iounmap(hdmi->htop1); iounmap(hdmi->base); release_mem_region(res->start, resource_size(res)); - kfree(hdmi); return 0; } |