Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
staging
/
mt29f_spinand
/
mt29f_spinand.h
diff --git
a/kernel/drivers/staging/mt29f_spinand/mt29f_spinand.h
b/kernel/drivers/staging/mt29f_spinand/mt29f_spinand.h
index
7f2c24d
..
ae62975
100644
(file)
--- a/
kernel/drivers/staging/mt29f_spinand/mt29f_spinand.h
+++ b/
kernel/drivers/staging/mt29f_spinand/mt29f_spinand.h
@@
-44,19
+44,19
@@
/* status */
#define STATUS_OIP_MASK 0x01
/* 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_MASK 0x04
-#define STATUS_E_FAIL
(1 <<
2)
+#define STATUS_E_FAIL
BIT(
2)
#define STATUS_P_FAIL_MASK 0x08
#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_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
/*ECC enable defines*/
#define OTP_ECC_MASK 0x10
@@
-84,8
+84,8
@@
struct spinand_info {
};
struct spinand_state {
};
struct spinand_state {
- u
int32_t
col;
- u
int32_t
row;
+ u
32
col;
+ u
32
row;
int buf_ptr;
u8 *buf;
};
int buf_ptr;
u8 *buf;
};
@@
-101,7
+101,7
@@
struct spinand_cmd {
u8 *rx_buf; /* Rx buf */
};
u8 *rx_buf; /* Rx buf */
};
-
extern
int spinand_mtd(struct mtd_info *mtd);
-
extern
void spinand_mtd_release(struct mtd_info *mtd);
+int spinand_mtd(struct mtd_info *mtd);
+void spinand_mtd_release(struct mtd_info *mtd);
#endif /* __LINUX_MTD_SPI_NAND_H */
#endif /* __LINUX_MTD_SPI_NAND_H */