From bf6ffe39443608a422132932301759a2ecaa8920 Mon Sep 17 00:00:00 2001
From: Hui Wang <jason77.wang@gmail.com>
Date: Thu, 28 Jun 2012 16:21:34 +0800
Subject: [PATCH] --- yaml --- r: 315038 b: refs/heads/master c:
 afc016d8360ceb19a1f37bf6579d5850d47d582d h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/net/can/flexcan.c | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 68044f4c7cda..caf9d93ffaf7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b7b736fbfa1307fd294ca1fca69316f1b07a806
+refs/heads/master: afc016d8360ceb19a1f37bf6579d5850d47d582d
diff --git a/trunk/drivers/net/can/flexcan.c b/trunk/drivers/net/can/flexcan.c
index 0f88cd3bb928..b429b3f3fa7f 100644
--- a/trunk/drivers/net/can/flexcan.c
+++ b/trunk/drivers/net/can/flexcan.c
@@ -938,14 +938,9 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
 	if (IS_ERR(pinctrl))
 		return PTR_ERR(pinctrl);
 
-	if (pdev->dev.of_node) {
-		const __be32 *clock_freq_p;
-
-		clock_freq_p = of_get_property(pdev->dev.of_node,
-						"clock-frequency", NULL);
-		if (clock_freq_p)
-			clock_freq = be32_to_cpup(clock_freq_p);
-	}
+	if (pdev->dev.of_node)
+		of_property_read_u32(pdev->dev.of_node,
+						"clock-frequency", &clock_freq);
 
 	if (!clock_freq) {
 		clk = clk_get(&pdev->dev, NULL);