1 files changed, 25 insertions, 23 deletions

diff --git a/drivers/block/mtip32xx/mtip32xx.h b/drivers/block/mtip32xx/mtip32xx.h
index 4ef58336310a..b2c88da26b2a 100644
--- a/drivers/block/mtip32xx/mtip32xx.h
+++ b/drivers/block/mtip32xx/mtip32xx.h
@@ -113,33 +113,35 @@
 
 #define __force_bit2int (unsigned int __force)
 
-/* below are bit numbers in 'flags' defined in mtip_port */
-#define MTIP_PF_IC_ACTIVE_BIT           0 /* pio/ioctl */
-#define MTIP_PF_EH_ACTIVE_BIT           1 /* error handling */
-#define MTIP_PF_SE_ACTIVE_BIT           2 /* secure erase */
-#define MTIP_PF_DM_ACTIVE_BIT           3 /* download microcde */
-#define MTIP_PF_PAUSE_IO        ((1 << MTIP_PF_IC_ACTIVE_BIT) | \
+enum {
+        /* below are bit numbers in 'flags' defined in mtip_port */
+        MTIP_PF_IC_ACTIVE_BIT       = 0, /* pio/ioctl */
+        MTIP_PF_EH_ACTIVE_BIT       = 1, /* error handling */
+        MTIP_PF_SE_ACTIVE_BIT       = 2, /* secure erase */
+        MTIP_PF_DM_ACTIVE_BIT       = 3, /* download microcde */
+        MTIP_PF_PAUSE_IO      = ((1 << MTIP_PF_IC_ACTIVE_BIT) | \
                                 (1 << MTIP_PF_EH_ACTIVE_BIT) | \
                                 (1 << MTIP_PF_SE_ACTIVE_BIT) | \
-                                (1 << MTIP_PF_DM_ACTIVE_BIT))
-
-#define MTIP_PF_SVC_THD_ACTIVE_BIT      4
-#define MTIP_PF_ISSUE_CMDS_BIT          5
-#define MTIP_PF_REBUILD_BIT             6
-#define MTIP_PF_SVC_THD_STOP_BIT        8
-
-/* below are bit numbers in 'dd_flag' defined in driver_data */
-#define MTIP_DDF_REMOVE_PENDING_BIT     1
-#define MTIP_DDF_OVER_TEMP_BIT          2
-#define MTIP_DDF_WRITE_PROTECT_BIT      3
-#define MTIP_DDF_STOP_IO        ((1 << MTIP_DDF_REMOVE_PENDING_BIT) | \
+                                (1 << MTIP_PF_DM_ACTIVE_BIT)),
+
+        MTIP_PF_SVC_THD_ACTIVE_BIT  = 4,
+        MTIP_PF_ISSUE_CMDS_BIT      = 5,
+        MTIP_PF_REBUILD_BIT         = 6,
+        MTIP_PF_SVC_THD_STOP_BIT    = 8,
+
+        /* below are bit numbers in 'dd_flag' defined in driver_data */
+        MTIP_DDF_REMOVE_PENDING_BIT = 1,
+        MTIP_DDF_OVER_TEMP_BIT      = 2,
+        MTIP_DDF_WRITE_PROTECT_BIT  = 3,
+        MTIP_DDF_STOP_IO      = ((1 << MTIP_DDF_REMOVE_PENDING_BIT) | \
                                 (1 << MTIP_DDF_OVER_TEMP_BIT) | \
-                                (1 << MTIP_DDF_WRITE_PROTECT_BIT))
+                                (1 << MTIP_DDF_WRITE_PROTECT_BIT)),
 
-#define MTIP_DDF_CLEANUP_BIT            5
-#define MTIP_DDF_RESUME_BIT             6
-#define MTIP_DDF_INIT_DONE_BIT          7
-#define MTIP_DDF_REBUILD_FAILED_BIT     8
+        MTIP_DDF_CLEANUP_BIT        = 5,
+        MTIP_DDF_RESUME_BIT         = 6,
+        MTIP_DDF_INIT_DONE_BIT      = 7,
+        MTIP_DDF_REBUILD_FAILED_BIT = 8,
+};
 
 __packed struct smart_attr{
         u8 attr_id;