summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2013-10-10 08:30:21 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2013-10-11 07:56:54 +0200
commit5c128df7471a6917f84cde3cea786541aaa404a2 (patch)
treefaac7132492d1ce7e80aa1e5a7658b604acd1af1 /drivers/video
parentvideo: xilinxfb: Use standard variable name convention (diff)
downloadlinux-5c128df7471a6917f84cde3cea786541aaa404a2.tar.xz
linux-5c128df7471a6917f84cde3cea786541aaa404a2.zip
video: xilinxfb: Use devm_kzalloc instead of kzalloc
Simplify driver probe and release function. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/xilinxfb.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index d12345f7fca4..c420328afb40 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -368,8 +368,6 @@ err_fbmem:
devm_iounmap(dev, drvdata->regs);
err_region:
- kfree(drvdata);
-
return rc;
}
@@ -402,8 +400,6 @@ static int xilinxfb_release(struct device *dev)
dcr_unmap(drvdata->dcr_host, drvdata->dcr_len);
#endif
- kfree(drvdata);
-
return 0;
}
@@ -423,11 +419,9 @@ static int xilinxfb_of_probe(struct platform_device *pdev)
pdata = xilinx_fb_default_pdata;
/* Allocate the driver data region */
- drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL);
- if (!drvdata) {
- dev_err(&pdev->dev, "Couldn't allocate device private record\n");
+ drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);
+ if (!drvdata)
return -ENOMEM;
- }
/*
* To check whether the core is connected directly to DCR or BUS
@@ -451,7 +445,6 @@ static int xilinxfb_of_probe(struct platform_device *pdev)
drvdata->dcr_host = dcr_map(op->dev.of_node, start, drvdata->dcr_len);
if (!DCR_MAP_OK(drvdata->dcr_host)) {
dev_err(&op->dev, "invalid DCR address\n");
- kfree(drvdata);
return -ENODEV;
}
}