UBI: embed ubi_debug_info field in ubi_device struct

[deliverable/linux.git] / drivers / mtd / ubi / debug.h

diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h
index 0add8d8a1672da7411ad3fb01a9d813b8195bb60..33f8f3b2c9b22ac9909aa6ad07f6a1317873ed7c 100644 (file)
--- a/drivers/mtd/ubi/debug.h
+++ b/drivers/mtd/ubi/debug.h
@@ -60,51 +60,11 @@ void ubi_dump_aeb(const struct ubi_ainf_peb *aeb, int type);
 void ubi_dump_mkvol_req(const struct ubi_mkvol_req *req);
 int ubi_self_check_all_ff(struct ubi_device *ubi, int pnum, int offset,
                          int len);
-int ubi_debugging_init_dev(struct ubi_device *ubi);
-void ubi_debugging_exit_dev(struct ubi_device *ubi);
 int ubi_debugfs_init(void);
 void ubi_debugfs_exit(void);
 int ubi_debugfs_init_dev(struct ubi_device *ubi);
 void ubi_debugfs_exit_dev(struct ubi_device *ubi);
 
-/*
- * The UBI debugfs directory name pattern and maximum name length (3 for "ubi"
- * + 2 for the number plus 1 for the trailing zero byte.
- */
-#define UBI_DFS_DIR_NAME "ubi%d"
-#define UBI_DFS_DIR_LEN  (3 + 2 + 1)
-
-/**
- * struct ubi_debug_info - debugging information for an UBI device.
- *
- * @chk_gen: if UBI general extra checks are enabled
- * @chk_io: if UBI I/O extra checks are enabled
- * @disable_bgt: disable the background task for testing purposes
- * @emulate_bitflips: emulate bit-flips for testing purposes
- * @emulate_io_failures: emulate write/erase failures for testing purposes
- * @dfs_dir_name: name of debugfs directory containing files of this UBI device
- * @dfs_dir: direntry object of the UBI device debugfs directory
- * @dfs_chk_gen: debugfs knob to enable UBI general extra checks
- * @dfs_chk_io: debugfs knob to enable UBI I/O extra checks
- * @dfs_disable_bgt: debugfs knob to disable the background task
- * @dfs_emulate_bitflips: debugfs knob to emulate bit-flips
- * @dfs_emulate_io_failures: debugfs knob to emulate write/erase failures
- */
-struct ubi_debug_info {
-       unsigned int chk_gen:1;
-       unsigned int chk_io:1;
-       unsigned int disable_bgt:1;
-       unsigned int emulate_bitflips:1;
-       unsigned int emulate_io_failures:1;
-       char dfs_dir_name[UBI_DFS_DIR_LEN + 1];
-       struct dentry *dfs_dir;
-       struct dentry *dfs_chk_gen;
-       struct dentry *dfs_chk_io;
-       struct dentry *dfs_disable_bgt;
-       struct dentry *dfs_emulate_bitflips;
-       struct dentry *dfs_emulate_io_failures;
-};
-
 /**
  * ubi_dbg_is_bgt_disabled - if the background thread is disabled.
  * @ubi: UBI device description object
@@ -114,7 +74,7 @@ struct ubi_debug_info {
  */
 static inline int ubi_dbg_is_bgt_disabled(const struct ubi_device *ubi)
 {
-       return ubi->dbg->disable_bgt;
+       return ubi->dbg.disable_bgt;
 }
 
 /**
@@ -125,7 +85,7 @@ static inline int ubi_dbg_is_bgt_disabled(const struct ubi_device *ubi)
  */
 static inline int ubi_dbg_is_bitflip(const struct ubi_device *ubi)
 {
-       if (ubi->dbg->emulate_bitflips)
+       if (ubi->dbg.emulate_bitflips)
                return !(random32() % 200);
        return 0;
 }
@@ -139,7 +99,7 @@ static inline int ubi_dbg_is_bitflip(const struct ubi_device *ubi)
  */
 static inline int ubi_dbg_is_write_failure(const struct ubi_device *ubi)
 {
-       if (ubi->dbg->emulate_io_failures)
+       if (ubi->dbg.emulate_io_failures)
                return !(random32() % 500);
        return 0;
 }
@@ -153,18 +113,18 @@ static inline int ubi_dbg_is_write_failure(const struct ubi_device *ubi)
  */
 static inline int ubi_dbg_is_erase_failure(const struct ubi_device *ubi)
 {
-       if (ubi->dbg->emulate_io_failures)
+       if (ubi->dbg.emulate_io_failures)
                return !(random32() % 400);
        return 0;
 }
 
 static inline int ubi_dbg_chk_io(const struct ubi_device *ubi)
 {
-       return ubi->dbg->chk_io;
+       return ubi->dbg.chk_io;
 }
 
 static inline int ubi_dbg_chk_gen(const struct ubi_device *ubi)
 {
-       return ubi->dbg->chk_gen;
+       return ubi->dbg.chk_gen;
 }
 #endif /* !__UBI_DEBUG_H__ */