1 files changed, 32 insertions, 50 deletions

diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 37be05bbfbc8..9f5b312af783 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -32,17 +32,19 @@
 #define MTD_CHAR_MAJOR 90
 #define MTD_BLOCK_MAJOR 31
 
-#define MTD_ERASE_PENDING       0x01
+#define MTD_ERASE_PENDING       0x01
 #define MTD_ERASING             0x02
 #define MTD_ERASE_SUSPEND       0x04
-#define MTD_ERASE_DONE          0x08
-#define MTD_ERASE_FAILED        0x10
+#define MTD_ERASE_DONE          0x08
+#define MTD_ERASE_FAILED        0x10
 
 #define MTD_FAIL_ADDR_UNKNOWN -1LL
 
-/* If the erase fails, fail_addr might indicate exactly which block failed.  If
-   fail_addr = MTD_FAIL_ADDR_UNKNOWN, the failure was not at the device level or was not
-   specific to any particular block. */
+/*
+ * If the erase fails, fail_addr might indicate exactly which block failed. If
+ * fail_addr = MTD_FAIL_ADDR_UNKNOWN, the failure was not at the device level
+ * or was not specific to any particular block.
+ */
 struct erase_info {
         struct mtd_info *mtd;
         uint64_t addr;
@@ -59,26 +61,12 @@ struct erase_info {
 };
 
 struct mtd_erase_region_info {
-        uint64_t offset;                        /* At which this region starts, from the beginning of the MTD */
+        uint64_t offset;                /* At which this region starts, from the beginning of the MTD */
         uint32_t erasesize;             /* For this region */
         uint32_t numblocks;             /* Number of blocks of erasesize in this region */
         unsigned long *lockmap;         /* If keeping bitmap of locks */
 };
 
-/*
- * oob operation modes
- *
- * MTD_OOB_PLACE:       oob data are placed at the given offset
- * MTD_OOB_AUTO:        oob data are automatically placed at the free areas
- *                      which are defined by the ecclayout
- * MTD_OOB_RAW:         mode to read oob and data without doing ECC checking
- */
-typedef enum {
-        MTD_OOB_PLACE,
-        MTD_OOB_AUTO,
-        MTD_OOB_RAW,
-} mtd_oob_mode_t;
-
 /**
  * struct mtd_oob_ops - oob operation operands
  * @mode:       operation mode
@@ -90,7 +78,7 @@ typedef enum {
  * @ooblen:     number of oob bytes to write/read
  * @oobretlen:  number of oob bytes written/read
  * @ooboffs:    offset of oob data in the oob area (only relevant when
- *              mode = MTD_OOB_PLACE)
+ *              mode = MTD_OPS_PLACE_OOB or MTD_OPS_RAW)
  * @datbuf:     data buffer - if NULL only oob data are read/written
  * @oobbuf:     oob data buffer
  *
@@ -99,7 +87,7 @@ typedef enum {
  * OOB area.
  */
 struct mtd_oob_ops {
-        mtd_oob_mode_t  mode;
+        unsigned int    mode;
         size_t          len;
         size_t          retlen;
         size_t          ooblen;
@@ -173,7 +161,7 @@ struct mtd_info {
         const char *name;
         int index;
 
-        /* ecc layout structure pointer - read only ! */
+        /* ECC layout structure pointer - read only! */
         struct nand_ecclayout *ecclayout;
 
         /* Data for variable erase regions. If numeraseregions is zero,
@@ -324,10 +312,15 @@ static inline uint32_t mtd_mod_by_ws(uint64_t sz, struct mtd_info *mtd)
         /* Kernel-side ioctl definitions */
 
 struct mtd_partition;
-
-extern int mtd_device_register(struct mtd_info *master,
-                               const struct mtd_partition *parts,
-                               int nr_parts);
+struct mtd_part_parser_data;
+
+extern int mtd_device_parse_register(struct mtd_info *mtd,
+                              const char **part_probe_types,
+                              struct mtd_part_parser_data *parser_data,
+                              const struct mtd_partition *defparts,
+                              int defnr_parts);
+#define mtd_device_register(master, parts, nr_parts)    \
+        mtd_device_parse_register(master, NULL, NULL, parts, nr_parts)
 extern int mtd_device_unregister(struct mtd_info *master);
 extern struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num);
 extern int __get_mtd_device(struct mtd_info *mtd);
@@ -356,27 +349,16 @@ void *mtd_kmalloc_up_to(const struct mtd_info *mtd, size_t *size);
 
 void mtd_erase_callback(struct erase_info *instr);
 
-/*
- * Debugging macro and defines
- */
-#define MTD_DEBUG_LEVEL0        (0)     /* Quiet   */
-#define MTD_DEBUG_LEVEL1        (1)     /* Audible */
-#define MTD_DEBUG_LEVEL2        (2)     /* Loud    */
-#define MTD_DEBUG_LEVEL3        (3)     /* Noisy   */
-
-#ifdef CONFIG_MTD_DEBUG
-#define DEBUG(n, args...)                               \
-        do {                                            \
-                if (n <= CONFIG_MTD_DEBUG_VERBOSE)      \
-                        printk(KERN_INFO args);         \
-        } while(0)
-#else /* CONFIG_MTD_DEBUG */
-#define DEBUG(n, args...)                               \
-        do {                                            \
-                if (0)                                  \
-                        printk(KERN_INFO args);         \
-        } while(0)
-
-#endif /* CONFIG_MTD_DEBUG */
+static inline int mtd_is_bitflip(int err) {
+        return err == -EUCLEAN;
+}
+
+static inline int mtd_is_eccerr(int err) {
+        return err == -EBADMSG;
+}
+
+static inline int mtd_is_bitflip_or_eccerr(int err) {
+        return mtd_is_bitflip(err) || mtd_is_eccerr(err);
+}
 
 #endif /* __MTD_MTD_H__ */