]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
powerpc/fsl_soc: improve and simplify fsl_get_sys_freq
authorHeiner Kallweit <hkallweit1@gmail.com>
Sat, 29 Oct 2016 14:27:14 +0000 (16:27 +0200)
committerScott Wood <oss@buserror.net>
Wed, 23 Nov 2016 07:23:36 +0000 (01:23 -0600)
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>
arch/powerpc/sysdev/fsl_soc.c

index d93056eedcb0a4a3c01e51c2ff3dc0e9b6163c77..48fc36b3851fd4b133cad6051e9e0a7fd3b930d2 100644 (file)
@@ -77,13 +77,10 @@ phys_addr_t get_immrbase(void)
 
 EXPORT_SYMBOL(get_immrbase);
 
-static u32 sysfreq = -1;
-
 u32 fsl_get_sys_freq(void)
 {
+       static u32 sysfreq = -1;
        struct device_node *soc;
-       const u32 *prop;
-       int size;
 
        if (sysfreq != -1)
                return sysfreq;
@@ -92,12 +89,9 @@ u32 fsl_get_sys_freq(void)
        if (!soc)
                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);
        return sysfreq;