Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / microblaze / include / asm / cpuinfo.h

diff --git a/arch/microblaze/include/asm/cpuinfo.h b/arch/microblaze/include/asm/cpuinfo.h
index 7d6831ac8a46eec66c4f1fc00ac28aa48000ed64..3337417fcdca3b6794d0e46dd65d150a472c00d6 100644 (file)
--- a/arch/microblaze/include/asm/cpuinfo.h
+++ b/arch/microblaze/include/asm/cpuinfo.h
@@ -91,15 +91,18 @@ extern struct cpuinfo cpuinfo;
 
 /* fwd declarations of the various CPUinfo populators */
 void setup_cpuinfo(void);
+void setup_cpuinfo_clk(void);
 
 void set_cpuinfo_static(struct cpuinfo *ci, struct device_node *cpu);
 void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu);
 
 static inline unsigned int fcpu(struct device_node *cpu, char *n)
 {
-       const __be32 *val;
-       return (val = of_get_property(cpu, n, NULL)) ?
-                                                       be32_to_cpup(val) : 0;
+       u32 val = 0;
+
+       of_property_read_u32(cpu, n, &val);
+
+       return val;
 }
 
 #endif /* _ASM_MICROBLAZE_CPUINFO_H */