mtd: unify status enum from three headers

[mirror_ubuntu-zesty-kernel.git] / include / linux / mtd / onenand.h

diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h
index 4e49f3350678c63ee2b1c48908498bee0cdb6ffc..f57e29e17bb0264ecf74b43bb35c5ad47a81631c 100644 (file)
--- a/include/linux/mtd/onenand.h
+++ b/include/linux/mtd/onenand.h
@@ -14,6 +14,7 @@
 
 #include <linux/spinlock.h>
 #include <linux/completion.h>
+#include <linux/mtd/flashchip.h>
 #include <linux/mtd/onenand_regs.h>
 #include <linux/mtd/bbm.h>
 
@@ -25,22 +26,6 @@ extern int onenand_scan(struct mtd_info *mtd, int max_chips);
 /* Free resources held by the OneNAND device */
 extern void onenand_release(struct mtd_info *mtd);
 
-/*
- * onenand_state_t - chip states
- * Enumeration for OneNAND flash chip state
- */
-typedef enum {
-       FL_READY,
-       FL_READING,
-       FL_WRITING,
-       FL_ERASING,
-       FL_SYNCING,
-       FL_LOCKING,
-       FL_RESETING,
-       FL_OTPING,
-       FL_PM_SUSPENDED,
-} onenand_state_t;
-
 /**
  * struct onenand_bufferram - OneNAND BufferRAM Data
  * @blockpage:         block & page address in BufferRAM
@@ -137,7 +122,7 @@ struct onenand_chip {
 
        spinlock_t              chip_lock;
        wait_queue_head_t       wq;
-       onenand_state_t         state;
+       flstate_t               state;
        unsigned char           *page_buf;
        unsigned char           *oob_buf;