diff --git a/drivers/staging/hisysevent/hisysevent_raw_data_encoder.c b/drivers/staging/hisysevent/hisysevent_raw_data_encoder.c
index 9ccc928962e6678fb957c78060a0cabdd9cedcc3..1e562613768c24b421c607b98d21b7f6d8fd65ad 100644
--- a/drivers/staging/hisysevent/hisysevent_raw_data_encoder.c
+++ b/drivers/staging/hisysevent/hisysevent_raw_data_encoder.c
@@ -16,13 +16,13 @@
 #include <linux/uio.h>
 #include <linux/vmalloc.h>
 
-#define TAG_BYTE_OFFSET 5
-#define TAG_BYTE_BOUND (BIT(TAG_BYTE_OFFSET))
-#define TAG_BYTE_MASK (TAG_BYTE_BOUND - 1)
+static const u8 TAG_BYTE_OFFSET = 5;
+static const u8 TAG_BYTE_BOUND = 1 << TAG_BYTE_OFFSET;
+static const u8 TAG_BYTE_MASK = TAG_BYTE_BOUND - 1;
 
-#define NON_TAG_BYTE_OFFSET 7
-#define NON_TAG_BYTE_BOUND (BIT(NON_TAG_BYTE_OFFSET))
-#define NON_TAG_BYTE_MASK (NON_TAG_BYTE_BOUND - 1)
+static const u8 NON_TAG_BYTE_OFFSET = 7;
+static const u8 NON_TAG_BYTE_BOUND = 1 << NON_TAG_BYTE_OFFSET;
+static const u8 NON_TAG_BYTE_MASK = NON_TAG_BYTE_BOUND - 1;
 
 enum hisysevent_encode_type {
 	// zigzag varint