[102/108] video: xilinxfb: Use devm_kzalloc instead of kzalloc

Commit Message

Daniel Sangorrin Dec. 13, 2013, 8:22 a.m. UTC

From: Michal Simek <[e-mail]>

Simplify driver probe and release function.

Signed-off-by: Michal Simek <[e-mail]>
Reviewed-by: Jingoo Han <[e-mail]>
Signed-off-by: Tomi Valkeinen <[e-mail]>
(cherry picked from commit 5c128df7471a6917f84cde3cea786541aaa404a2)
Signed-off-by: Daniel Sangorrin <[e-mail]>
Signed-off-by: Yoshitake Kobayashi <[e-mail]>
---
 drivers/video/xilinxfb.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

Patch

diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index d12345f..c420328 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;
 		}
 	}