Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa44d1d3 authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBI: remove Kconfig debugging option 



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: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 718c00bb

drivers/mtd/ubi/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -52,12 +52,4 @@ config MTD_UBI_GLUEBI 
	   work on top of UBI. Do not enable this unless you use legacy

	   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

drivers/mtd/ubi/debug.c

+0 −4
Original line number Diff line number Diff line
@@ -106,8 +106,6 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr) 
		       vid_hdr, UBI_VID_HDR_SIZE, 1);

}



#ifdef CONFIG_MTD_UBI_DEBUG



/**

 * ubi_dump_vol_info - dump volume information.

 * @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);

}
 


#endif /* CONFIG_MTD_UBI_DEBUG */

drivers/mtd/ubi/debug.h

+0 −63
Original line number Diff line number Diff line
@@ -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_vid_hdr(const struct ubi_vid_hdr *vid_hdr);



#ifdef CONFIG_MTD_UBI_DEBUG

#include <linux/random.h>



#define ubi_assert(expr)  do {                                               \
@@ -166,66 +165,4 @@ static inline int ubi_dbg_is_erase_failure(const struct ubi_device *ubi) 
	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__ */

drivers/mtd/ubi/io.c

+0 −12
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ 
#include <linux/slab.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_peb_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_vid_hdr(const struct ubi_device *ubi, int pnum,

				  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.
@@ -1131,8 +1123,6 @@ int ubi_io_write_vid_hdr(struct ubi_device *ubi, int pnum, 
	return err;

}



#ifdef CONFIG_MTD_UBI_DEBUG



/**

 * paranoid_check_not_bad - ensure that a physical eraseblock is not bad.

 * @ubi: UBI device description object
@@ -1447,5 +1437,3 @@ error: 
	vfree(buf);

	return err;

}
 


#endif /* CONFIG_MTD_UBI_DEBUG */

drivers/mtd/ubi/scan.c

+0 −8
Original line number Diff line number Diff line
@@ -88,11 +88,7 @@ 
#include <linux/random.h>

#include "ubi.h"



#ifdef CONFIG_MTD_UBI_DEBUG

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 */

static struct ubi_ec_hdr *ech;
@@ -1329,8 +1325,6 @@ void ubi_scan_destroy_si(struct ubi_scan_info *si) 
	kfree(si);

}



#ifdef CONFIG_MTD_UBI_DEBUG



/**

 * paranoid_check_si - check the scanning information.

 * @ubi: UBI device description object
@@ -1601,5 +1595,3 @@ out: 
	dump_stack();

	return -EINVAL;

}
 


#endif /* CONFIG_MTD_UBI_DEBUG */