Commit 6f9fdf62 authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBI: remove UBI_IO_DEBUG macro 



This additional little macro is used to print a bit more messages
while scanning the media. However, we have the 'dbg_bld()' macro
for this, so we better us 'dbg_bld()' and kill UBI_IO_DEBUG. This
simplifies the code a tiny bit.

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 6edb9793

drivers/mtd/ubi/debug.h

+0 −3
Original line number Diff line number Diff line
@@ -91,10 +91,8 @@ void ubi_dbg_dump_flash(struct ubi_device *ubi, int pnum, int offset, int len); 
#ifdef CONFIG_MTD_UBI_DEBUG_MSG_BLD

/* Initialization and build messages */

#define dbg_bld(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__)

#define UBI_IO_DEBUG 1

#else

#define dbg_bld(fmt, ...) ({})

#define UBI_IO_DEBUG 0

#endif



#ifdef CONFIG_MTD_UBI_DEBUG_PARANOID
@@ -177,7 +175,6 @@ static inline int ubi_dbg_is_erase_failure(void) 
#define ubi_dbg_dump_flash(ubi, pnum, offset, len) ({})

#define ubi_dbg_print_hex_dump(l, ps, pt, r, g, b, len, a)  ({})



#define UBI_IO_DEBUG               0

#define DBG_DISABLE_BGT            0

#define ubi_dbg_is_bitflip()       0

#define ubi_dbg_is_write_failure() 0

drivers/mtd/ubi/io.c

+16 −18
Original line number Diff line number Diff line
@@ -783,8 +783,7 @@ int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum, 
			if (verbose)

				ubi_warn("no EC header found at PEB %d, "

					 "only 0xFF bytes", pnum);

			else if (UBI_IO_DEBUG)

				dbg_msg("no EC header found at PEB %d, "

			dbg_bld("no EC header found at PEB %d, "

				"only 0xFF bytes", pnum);

			if (!read_err)

				return UBI_IO_FF;
@@ -800,8 +799,8 @@ int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum, 
			ubi_warn("bad magic number at PEB %d: %08x instead of "

				 "%08x", pnum, magic, UBI_EC_HDR_MAGIC);

			ubi_dbg_dump_ec_hdr(ec_hdr);

		} else if (UBI_IO_DEBUG)

			dbg_msg("bad magic number at PEB %d: %08x instead of "

		}

		dbg_bld("bad magic number at PEB %d: %08x instead of "

			"%08x", pnum, magic, UBI_EC_HDR_MAGIC);

		return UBI_IO_BAD_HDR;

	}
@@ -814,8 +813,8 @@ int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum, 
			ubi_warn("bad EC header CRC at PEB %d, calculated "

				 "%#08x, read %#08x", pnum, crc, hdr_crc);

			ubi_dbg_dump_ec_hdr(ec_hdr);

		} else if (UBI_IO_DEBUG)

			dbg_msg("bad EC header CRC at PEB %d, calculated "

		}

		dbg_bld("bad EC header CRC at PEB %d, calculated "

			"%#08x, read %#08x", pnum, crc, hdr_crc);



		if (!read_err)
@@ -1039,8 +1038,7 @@ int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum, 
			if (verbose)

				ubi_warn("no VID header found at PEB %d, "

					 "only 0xFF bytes", pnum);

			else if (UBI_IO_DEBUG)

				dbg_msg("no VID header found at PEB %d, "

			dbg_bld("no VID header found at PEB %d, "

				"only 0xFF bytes", pnum);

			if (!read_err)

				return UBI_IO_FF;
@@ -1052,8 +1050,8 @@ int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum, 
			ubi_warn("bad magic number at PEB %d: %08x instead of "

				 "%08x", pnum, magic, UBI_VID_HDR_MAGIC);

			ubi_dbg_dump_vid_hdr(vid_hdr);

		} else if (UBI_IO_DEBUG)

			dbg_msg("bad magic number at PEB %d: %08x instead of "

		}

		dbg_bld("bad magic number at PEB %d: %08x instead of "

			"%08x", pnum, magic, UBI_VID_HDR_MAGIC);

		return UBI_IO_BAD_HDR;

	}
@@ -1066,8 +1064,8 @@ int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum, 
			ubi_warn("bad CRC at PEB %d, calculated %#08x, "

				 "read %#08x", pnum, crc, hdr_crc);

			ubi_dbg_dump_vid_hdr(vid_hdr);

		} else if (UBI_IO_DEBUG)

			dbg_msg("bad CRC at PEB %d, calculated %#08x, "

		}

		dbg_bld("bad CRC at PEB %d, calculated %#08x, "

			"read %#08x", pnum, crc, hdr_crc);

		if (!read_err)

			return UBI_IO_BAD_HDR;

CRA Git | Maintained and supported by SUSTech CRA and CCSE