forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UBI: remove Kconfig debugging option

Browse source 
This patch kills the UBI debugging Kconfig option completely and makes all the
debugging stuff to be always compiled-in. It was pain in the neck to maintain
this useless option because all users I am aware of have debugging enabled
anyway - how else will you diagnose errors otherwise?

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
This commit is contained in:
Artem Bityutskiy 2012-05-16 18:09:08 +03:00
commit aa44d1d35f
8 changed files with 0 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/mtd/ubi/Kconfig
View file

@ -52,12 +52,4 @@ config MTD_UBI_GLUEBI
work on top of UBI. Do not enable this unless you use legacy work on top of UBI. Do not enable this unless you use legacy
software. software.
config MTD_UBI_DEBUG
bool "UBI debugging"
depends on SYSFS
select DEBUG_FS
select KALLSYMS
help
This option enables UBI debugging.
endif # MTD_UBI endif # MTD_UBI

4
drivers/mtd/ubi/debug.c
View file

@ -106,8 +106,6 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr)
vid_hdr, UBI_VID_HDR_SIZE, 1); vid_hdr, UBI_VID_HDR_SIZE, 1);
} }
#ifdef CONFIG_MTD_UBI_DEBUG
/** /**
* ubi_dump_vol_info - dump volume information. * ubi_dump_vol_info - dump volume information.
* @vol: UBI volume description object * @vol: UBI volume description object
@ -474,5 +472,3 @@ void ubi_debugfs_exit_dev(struct ubi_device *ubi)
{ {
debugfs_remove_recursive(ubi->dbg->dfs_dir); debugfs_remove_recursive(ubi->dbg->dfs_dir);
} }
#endif /* CONFIG_MTD_UBI_DEBUG */

63
drivers/mtd/ubi/debug.h
View file

@ -25,7 +25,6 @@ void ubi_dump_flash(struct ubi_device *ubi, int pnum, int offset, int len);
void ubi_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr); void ubi_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr);
void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr); void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr);
#ifdef CONFIG_MTD_UBI_DEBUG
#include <linux/random.h> #include <linux/random.h>
#define ubi_assert(expr) do { \ #define ubi_assert(expr) do { \
@ -166,66 +165,4 @@ static inline int ubi_dbg_is_erase_failure(const struct ubi_device *ubi)
return 0; return 0;
} }
#else
/* Use "if (0)" to make compiler check arguments even if debugging is off */
#define ubi_assert(expr) do { \
if (0) { \
printk(KERN_CRIT "UBI assert failed in %s at %u (pid %d)\n", \
__func__, __LINE__, current->pid); \
} \
} while (0)
#define dbg_err(fmt, ...) do { \
if (0) \
ubi_err(fmt, ##__VA_ARGS__); \
} while (0)
#define ubi_dbg_msg(fmt, ...) do { \
if (0) \
printk(KERN_DEBUG fmt "\n", ##__VA_ARGS__); \
} while (0)
#define dbg_msg(fmt, ...) ubi_dbg_msg(fmt, ##__VA_ARGS__)
#define dbg_gen(fmt, ...) ubi_dbg_msg(fmt, ##__VA_ARGS__)
#define dbg_eba(fmt, ...) ubi_dbg_msg(fmt, ##__VA_ARGS__)
#define dbg_wl(fmt, ...) ubi_dbg_msg(fmt, ##__VA_ARGS__)
#define dbg_io(fmt, ...) ubi_dbg_msg(fmt, ##__VA_ARGS__)
#define dbg_bld(fmt, ...) ubi_dbg_msg(fmt, ##__VA_ARGS__)
static inline void
ubi_dump_vol_info(const struct ubi_volume *vol) { return; }
static inline void
ubi_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx) { return; }
static inline void ubi_dump_sv(const struct ubi_scan_volume *sv) { return; }
static inline void ubi_dump_seb(const struct ubi_scan_leb *seb,
int type) { return; }
static inline void
ubi_dump_mkvol_req(const struct ubi_mkvol_req *req) { return; }
static inline void
ubi_dbg_print_hex_dump(const char *l, const char *ps, int pt, int r,
int g, const void *b, size_t len, bool a) { return; }
static inline int ubi_dbg_check_all_ff(struct ubi_device *ubi,
int pnum, int offset,
int len) { return 0; }
static inline int ubi_dbg_check_write(struct ubi_device *ubi,
const void *buf, int pnum,
int offset, int len) { return 0; }
static inline int ubi_debugging_init_dev(struct ubi_device *ubi) { return 0; }
static inline void ubi_debugging_exit_dev(struct ubi_device *ubi) { return; }
static inline int ubi_debugfs_init(void) { return 0; }
static inline void ubi_debugfs_exit(void) { return; }
static inline int ubi_debugfs_init_dev(struct ubi_device *ubi) { return 0; }
static inline void ubi_debugfs_exit_dev(struct ubi_device *ubi) { return; }
static inline int
ubi_dbg_is_bgt_disabled(const struct ubi_device *ubi) { return 0; }
static inline int ubi_dbg_is_bitflip(const struct ubi_device *ubi) { return 0; }
static inline int
ubi_dbg_is_write_failure(const struct ubi_device *ubi) { return 0; }
static inline int
ubi_dbg_is_erase_failure(const struct ubi_device *ubi) { return 0; }
#endif /* !CONFIG_MTD_UBI_DEBUG */
#endif /* !__UBI_DEBUG_H__ */ #endif /* !__UBI_DEBUG_H__ */

12
drivers/mtd/ubi/io.c
View file

@ -91,7 +91,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include "ubi.h" #include "ubi.h"
#ifdef CONFIG_MTD_UBI_DEBUG
static int paranoid_check_not_bad(const struct ubi_device *ubi, int pnum); static int paranoid_check_not_bad(const struct ubi_device *ubi, int pnum);
static int paranoid_check_peb_ec_hdr(const struct ubi_device *ubi, int pnum); static int paranoid_check_peb_ec_hdr(const struct ubi_device *ubi, int pnum);
static int paranoid_check_ec_hdr(const struct ubi_device *ubi, int pnum, static int paranoid_check_ec_hdr(const struct ubi_device *ubi, int pnum,
@ -99,13 +98,6 @@ static int paranoid_check_ec_hdr(const struct ubi_device *ubi, int pnum,
static int paranoid_check_peb_vid_hdr(const struct ubi_device *ubi, int pnum); static int paranoid_check_peb_vid_hdr(const struct ubi_device *ubi, int pnum);
static int paranoid_check_vid_hdr(const struct ubi_device *ubi, int pnum, static int paranoid_check_vid_hdr(const struct ubi_device *ubi, int pnum,
const struct ubi_vid_hdr *vid_hdr); const struct ubi_vid_hdr *vid_hdr);
#else
#define paranoid_check_not_bad(ubi, pnum) 0
#define paranoid_check_peb_ec_hdr(ubi, pnum) 0
#define paranoid_check_ec_hdr(ubi, pnum, ec_hdr) 0
#define paranoid_check_peb_vid_hdr(ubi, pnum) 0
#define paranoid_check_vid_hdr(ubi, pnum, vid_hdr) 0
#endif
/** /**
* ubi_io_read - read data from a physical eraseblock. * ubi_io_read - read data from a physical eraseblock.
@ -1131,8 +1123,6 @@ int ubi_io_write_vid_hdr(struct ubi_device *ubi, int pnum,
return err; return err;
} }
#ifdef CONFIG_MTD_UBI_DEBUG
/** /**
* paranoid_check_not_bad - ensure that a physical eraseblock is not bad. * paranoid_check_not_bad - ensure that a physical eraseblock is not bad.
* @ubi: UBI device description object * @ubi: UBI device description object
@ -1447,5 +1437,3 @@ error:
vfree(buf); vfree(buf);
return err; return err;
} }
#endif /* CONFIG_MTD_UBI_DEBUG */

8
drivers/mtd/ubi/scan.c
View file

@ -88,11 +88,7 @@
#include <linux/random.h> #include <linux/random.h>
#include "ubi.h" #include "ubi.h"
#ifdef CONFIG_MTD_UBI_DEBUG
static int paranoid_check_si(struct ubi_device *ubi, struct ubi_scan_info *si); static int paranoid_check_si(struct ubi_device *ubi, struct ubi_scan_info *si);
#else
#define paranoid_check_si(ubi, si) 0
#endif
/* Temporary variables used during scanning */ /* Temporary variables used during scanning */
static struct ubi_ec_hdr *ech; static struct ubi_ec_hdr *ech;
@ -1329,8 +1325,6 @@ void ubi_scan_destroy_si(struct ubi_scan_info *si)
kfree(si); kfree(si);
} }
#ifdef CONFIG_MTD_UBI_DEBUG
/** /**
* paranoid_check_si - check the scanning information. * paranoid_check_si - check the scanning information.
* @ubi: UBI device description object * @ubi: UBI device description object
@ -1601,5 +1595,3 @@ out:
dump_stack(); dump_stack();
return -EINVAL; return -EINVAL;
} }
#endif /* CONFIG_MTD_UBI_DEBUG */

7
drivers/mtd/ubi/vmt.c
View file

@ -29,11 +29,7 @@
#include <linux/export.h> #include <linux/export.h>
#include "ubi.h" #include "ubi.h"
#ifdef CONFIG_MTD_UBI_DEBUG
static int paranoid_check_volumes(struct ubi_device *ubi); static int paranoid_check_volumes(struct ubi_device *ubi);
#else
#define paranoid_check_volumes(ubi) 0
#endif
static ssize_t vol_attribute_show(struct device *dev, static ssize_t vol_attribute_show(struct device *dev,
struct device_attribute *attr, char *buf); struct device_attribute *attr, char *buf);
@ -712,8 +708,6 @@ void ubi_free_volume(struct ubi_device *ubi, struct ubi_volume *vol)
volume_sysfs_close(vol); volume_sysfs_close(vol);
} }
#ifdef CONFIG_MTD_UBI_DEBUG
/** /**
* paranoid_check_volume - check volume information. * paranoid_check_volume - check volume information.
* @ubi: UBI device description object * @ubi: UBI device description object
@ -883,4 +877,3 @@ static int paranoid_check_volumes(struct ubi_device *ubi)
return err; return err;
} }
#endif

8
drivers/mtd/ubi/vtbl.c
View file

@ -62,11 +62,7 @@
#include <asm/div64.h> #include <asm/div64.h>
#include "ubi.h" #include "ubi.h"
#ifdef CONFIG_MTD_UBI_DEBUG
static void paranoid_vtbl_check(const struct ubi_device *ubi); static void paranoid_vtbl_check(const struct ubi_device *ubi);
#else
#define paranoid_vtbl_check(ubi)
#endif
/* Empty volume table record */ /* Empty volume table record */
static struct ubi_vtbl_record empty_vtbl_record; static struct ubi_vtbl_record empty_vtbl_record;
@ -858,8 +854,6 @@ out_free:
return err; return err;
} }
#ifdef CONFIG_MTD_UBI_DEBUG
/** /**
* paranoid_vtbl_check - check volume table. * paranoid_vtbl_check - check volume table.
* @ubi: UBI device description object * @ubi: UBI device description object
@ -874,5 +868,3 @@ static void paranoid_vtbl_check(const struct ubi_device *ubi)
BUG(); BUG();
} }
} }
#endif /* CONFIG_MTD_UBI_DEBUG */

10
drivers/mtd/ubi/wl.c
View file

@ -155,18 +155,12 @@ struct ubi_work {
int torture; int torture;
}; };
#ifdef CONFIG_MTD_UBI_DEBUG
static int paranoid_check_ec(struct ubi_device *ubi, int pnum, int ec); static int paranoid_check_ec(struct ubi_device *ubi, int pnum, int ec);
static int paranoid_check_in_wl_tree(const struct ubi_device *ubi, static int paranoid_check_in_wl_tree(const struct ubi_device *ubi,
struct ubi_wl_entry *e, struct ubi_wl_entry *e,
struct rb_root *root); struct rb_root *root);
static int paranoid_check_in_pq(const struct ubi_device *ubi, static int paranoid_check_in_pq(const struct ubi_device *ubi,
struct ubi_wl_entry *e); struct ubi_wl_entry *e);
#else
#define paranoid_check_ec(ubi, pnum, ec) 0
#define paranoid_check_in_wl_tree(ubi, e, root)
#define paranoid_check_in_pq(ubi, e) 0
#endif
/** /**
* wl_tree_add - add a wear-leveling entry to a WL RB-tree. * wl_tree_add - add a wear-leveling entry to a WL RB-tree.
@ -1526,8 +1520,6 @@ void ubi_wl_close(struct ubi_device *ubi)
kfree(ubi->lookuptbl); kfree(ubi->lookuptbl);
} }
#ifdef CONFIG_MTD_UBI_DEBUG
/** /**
* paranoid_check_ec - make sure that the erase counter of a PEB is correct. * paranoid_check_ec - make sure that the erase counter of a PEB is correct.
* @ubi: UBI device description object * @ubi: UBI device description object
@ -1624,5 +1616,3 @@ static int paranoid_check_in_pq(const struct ubi_device *ubi,
dump_stack(); dump_stack();
return -EINVAL; return -EINVAL;
} }
#endif /* CONFIG_MTD_UBI_DEBUG */