浏览代码

powerpc/fsl_soc: improve and simplify fsl_get_sys_freq

Use of_property_read_u32 instead of the generic of_get_property to
simplify the code. In addition move the declaration of sysfreq
into fsl_get_sys_freq because it's private to this function.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Scott Wood <oss@buserror.net>
Heiner Kallweit 9 年之前
父节点
当前提交
5bda6c0eb7
共有 1 个文件被更改,包括 4 次插入10 次删除
  1. 4 10
      arch/powerpc/sysdev/fsl_soc.c

+ 4 - 10
arch/powerpc/sysdev/fsl_soc.c

@@ -77,13 +77,10 @@ phys_addr_t get_immrbase(void)
 
 
 EXPORT_SYMBOL(get_immrbase);
 EXPORT_SYMBOL(get_immrbase);
 
 
-static u32 sysfreq = -1;
-
 u32 fsl_get_sys_freq(void)
 u32 fsl_get_sys_freq(void)
 {
 {
+	static u32 sysfreq = -1;
 	struct device_node *soc;
 	struct device_node *soc;
-	const u32 *prop;
-	int size;
 
 
 	if (sysfreq != -1)
 	if (sysfreq != -1)
 		return sysfreq;
 		return sysfreq;
@@ -92,12 +89,9 @@ u32 fsl_get_sys_freq(void)
 	if (!soc)
 	if (!soc)
 		return -1;
 		return -1;
 
 
-	prop = of_get_property(soc, "clock-frequency", &size);
-	if (!prop || size != sizeof(*prop) || *prop == 0)
-		prop = of_get_property(soc, "bus-frequency", &size);
-
-	if (prop && size == sizeof(*prop))
-		sysfreq = *prop;
+	of_property_read_u32(soc, "clock-frequency", &sysfreq);
+	if (sysfreq == -1 || !sysfreq)
+		of_property_read_u32(soc, "bus-frequency", &sysfreq);
 
 
 	of_node_put(soc);
 	of_node_put(soc);
 	return sysfreq;
 	return sysfreq;