ARM: 6293/1: coresight: cosmetic fixes

Use BIT() macro whenever it is sensible to do so.

Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Alexander Shishkin <virtuoso@slind.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/include/asm/hardware/coresight.h b/arch/arm/include/asm/hardware/coresight.h
index d84605175fc4eaaea5debc5ae1aef7131c46c196..7ecd793b8f5a94ebdbba19ee26ac9a75eaaa33d6 100644 (file)
--- a/arch/arm/include/asm/hardware/coresight.h
+++ b/arch/arm/include/asm/hardware/coresight.h
@@ -100,10 +100,10 @@
 
 /* ETM status register, "ETM Architecture", 3.3.2 */
 #define ETMR_STATUS            (0x10)
-#define ETMST_OVERFLOW         (1 << 0)
-#define ETMST_PROGBIT          (1 << 1)
-#define ETMST_STARTSTOP                (1 << 2)
-#define ETMST_TRIGGER          (1 << 3)
+#define ETMST_OVERFLOW         BIT(0)
+#define ETMST_PROGBIT          BIT(1)
+#define ETMST_STARTSTOP                BIT(2)
+#define ETMST_TRIGGER          BIT(3)
 
 #define etm_progbit(t)         (etm_readl((t), ETMR_STATUS) & ETMST_PROGBIT)
 #define etm_started(t)         (etm_readl((t), ETMR_STATUS) & ETMST_STARTSTOP)
@@ -111,7 +111,7 @@
 
 #define ETMR_TRACEENCTRL2      0x1c
 #define ETMR_TRACEENCTRL       0x24
-#define ETMTE_INCLEXCL         (1 << 24)
+#define ETMTE_INCLEXCL         BIT(24)
 #define ETMR_TRACEENEVT                0x20
 #define ETMCTRL_OPTS           (ETMCTRL_DO_CPRT | \
                                ETMCTRL_DATA_DO_ADDR | \
@@ -134,12 +134,12 @@
 #define ETBR_CTRL              0x20
 #define ETBR_FORMATTERCTRL     0x304
 #define ETBFF_ENFTC            1
-#define ETBFF_ENFCONT          (1 << 1)
-#define ETBFF_FONFLIN          (1 << 4)
-#define ETBFF_MANUAL_FLUSH     (1 << 6)
-#define ETBFF_TRIGIN           (1 << 8)
-#define ETBFF_TRIGEVT          (1 << 9)
-#define ETBFF_TRIGFL           (1 << 10)
+#define ETBFF_ENFCONT          BIT(1)
+#define ETBFF_FONFLIN          BIT(4)
+#define ETBFF_MANUAL_FLUSH     BIT(6)
+#define ETBFF_TRIGIN           BIT(8)
+#define ETBFF_TRIGEVT          BIT(9)
+#define ETBFF_TRIGFL           BIT(10)
 
 #define etb_writel(t, v, x) \
        (__raw_writel((v), (t)->etb_regs + (x)))