Merge remote branch 'linus/master' into x86/bootmem

[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / include / mach / hardware.h

diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h
index 50f1297bf5ac80c3e6ec04fac737487d110bb14f..e741bf1bfb2ddc55a0112ffdbdf983594bcf3327 100644 (file)
--- a/arch/arm/mach-pxa/include/mach/hardware.h
+++ b/arch/arm/mach-pxa/include/mach/hardware.h
@@ -250,20 +250,17 @@
 
 #define cpu_is_pxa930()                                        \
        ({                                              \
-               unsigned int id = read_cpuid(CPUID_ID); \
-               __cpu_is_pxa930(id);                    \
+               __cpu_is_pxa930(read_cpuid_id());       \
         })
 
 #define cpu_is_pxa935()                                        \
        ({                                              \
-               unsigned int id = read_cpuid(CPUID_ID); \
-               __cpu_is_pxa935(id);                    \
+               __cpu_is_pxa935(read_cpuid_id());       \
         })
 
 #define cpu_is_pxa950()                                        \
        ({                                              \
-               unsigned int id = read_cpuid(CPUID_ID); \
-               __cpu_is_pxa950(id);                    \
+               __cpu_is_pxa950(read_cpuid_id());       \
         })