Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[firefly-linux-kernel-4.4.55.git] / drivers / staging / mt29f_spinand / mt29f_spinand.h

diff --git a/drivers/staging/mt29f_spinand/mt29f_spinand.h b/drivers/staging/mt29f_spinand/mt29f_spinand.h
index 6c8e413b5b632d005d3693a985f9bf2e71a943dc..ae62975cf44a7bb4fa37ba008191c6e6968666b2 100644 (file)
--- a/drivers/staging/mt29f_spinand/mt29f_spinand.h
+++ b/drivers/staging/mt29f_spinand/mt29f_spinand.h
@@ -44,19 +44,19 @@
 
 /* status */
 #define STATUS_OIP_MASK                        0x01
-#define STATUS_READY                   (0 << 0)
-#define STATUS_BUSY                    (1 << 0)
+#define STATUS_READY                   0
+#define STATUS_BUSY                    BIT(0)
 
 #define STATUS_E_FAIL_MASK             0x04
-#define STATUS_E_FAIL                  (1 << 2)
+#define STATUS_E_FAIL                  BIT(2)
 
 #define STATUS_P_FAIL_MASK             0x08
-#define STATUS_P_FAIL                  (1 << 3)
+#define STATUS_P_FAIL                  BIT(3)
 
 #define STATUS_ECC_MASK                        0x30
-#define STATUS_ECC_1BIT_CORRECTED      (1 << 4)
-#define STATUS_ECC_ERROR               (2 << 4)
-#define STATUS_ECC_RESERVED            (3 << 4)
+#define STATUS_ECC_1BIT_CORRECTED      BIT(4)
+#define STATUS_ECC_ERROR               BIT(5)
+#define STATUS_ECC_RESERVED            (BIT(5) | BIT(4))
 
 /*ECC enable defines*/
 #define OTP_ECC_MASK                   0x10
@@ -84,8 +84,8 @@ struct spinand_info {
 };
 
 struct spinand_state {
-       uint32_t        col;
-       uint32_t        row;
+       u32     col;
+       u32     row;
        int             buf_ptr;
        u8              *buf;
 };