Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / mach-vexpress / spc.c

diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-vexpress/spc.c
index 0f5381d1349418c5de2723be59811be30a402f8e..354e0e7025aec5c1da2145ae4037f7e805868970 100644 (file)
--- a/arch/arm/mach-vexpress/spc.c
+++ b/arch/arm/mach-vexpress/spc.c
@@ -69,7 +69,7 @@
 #define A7_PERFVAL_BASE                0xC30
 
 /* Config interface control bits */
-#define SYSCFG_START           (1 << 31)
+#define SYSCFG_START           BIT(31)
 #define SYSCFG_SCC             (6 << 20)
 #define SYSCFG_STAT            (14 << 20)
 
@@ -162,7 +162,7 @@ void ve_spc_cpu_wakeup_irq(u32 cluster, u32 cpu, bool set)
        if (cluster >= MAX_CLUSTERS)
                return;
 
-       mask = 1 << cpu;
+       mask = BIT(cpu);
 
        if (!cluster_is_a15(cluster))
                mask <<= 4;