From: Terry Lv <r65388@freescale.com>
Date: Fri, 20 Jul 2012 03:01:29 +0000 (+0800)
Subject: ENGR00217732-1: revert back rngc code
X-Git-Tag: v3.0.35-fsl_4.1.0~884
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1b203f08bfd44acd4ff4d8313dabb96133c115d4;p=karo-tx-linux.git

ENGR00217732-1: revert back rngc code

Revert to rngc code before as we will add dummy clock for it.

Signed-off-by: Terry Lv <r65388@freescale.com>
---

diff --git a/drivers/char/hw_random/fsl-rngc.c b/drivers/char/hw_random/fsl-rngc.c
index 5efe810b1aab..0ce3299639b1 100644
--- a/drivers/char/hw_random/fsl-rngc.c
+++ b/drivers/char/hw_random/fsl-rngc.c
@@ -135,7 +135,7 @@ static int fsl_rngc_data_present(struct hwrng *rng, int wait)
 	return level > 0 ? 1 : 0;
 }
 
-static int fsl_rngc_data_read(struct hwrng *rng, u32 *data)
+static int fsl_rngc_data_read(struct hwrng *rng, u32 * data)
 {
 	int err;
 	u32 rngc_base = (u32) rng->priv;
@@ -293,10 +293,13 @@ static int __init fsl_rngc_probe(struct platform_device *pdev)
 
 	clk = clk_get(&pdev->dev, "rng_clk");
 
-	if (IS_ERR(clk))
-		dev_warn(&pdev->dev, "No rng_clk specified\n");
-	else
-		clk_enable(clk);
+	if (IS_ERR(clk)) {
+		dev_err(&pdev->dev, "Can not get rng_clk\n");
+		err = PTR_ERR(clk);
+		return err;
+	}
+
+	clk_enable(clk);
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
@@ -337,7 +340,7 @@ static int __exit fsl_rngc_remove(struct platform_device *pdev)
 	clk = clk_get(&pdev->dev, "rng_clk");
 
 	if (IS_ERR(clk))
-		dev_warn(&pdev->dev, "No rng_clk specified\n");
+		dev_err(&pdev->dev, "Can not get rng_clk\n");
 	else
 		clk_disable(clk);