Commit 1f021e1d authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBI: rename ubi_dbg_dump_vtbl_record 



I am going to remove the "UBI debugging" compilation option and make the
debugging stuff to be always compiled it. This patch is a preparation
which renames 'ubi_dbg_dump_vtbl_record()' to 'ubi_dump_vtbl_record()'.

Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 766381f0

drivers/mtd/ubi/debug.c

+2 −2
Original line number Diff line number Diff line
@@ -139,11 +139,11 @@ void ubi_dump_vol_info(const struct ubi_volume *vol) 
}



/**

 * ubi_dbg_dump_vtbl_record - dump a &struct ubi_vtbl_record object.

 * ubi_dump_vtbl_record - dump a &struct ubi_vtbl_record object.

 * @r: the object to dump

 * @idx: volume table index

 */

void ubi_dbg_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx)

void ubi_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx)

{

	int name_len = be16_to_cpu(r->name_len);

drivers/mtd/ubi/debug.h

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr); 
#define dbg_bld(fmt, ...) ubi_dbg_msg("bld", fmt, ##__VA_ARGS__)



void ubi_dump_vol_info(const struct ubi_volume *vol);

void ubi_dbg_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx);

void ubi_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx);

void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv);

void ubi_dbg_dump_seb(const struct ubi_scan_leb *seb, int type);

void ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req);
@@ -196,7 +196,7 @@ static inline int ubi_dbg_is_erase_failure(const struct ubi_device *ubi) 
static inline void

ubi_dump_vol_info(const struct ubi_volume *vol)                      { return; }

static inline void

ubi_dbg_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx)   { return; }

ubi_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx)       { return; }

static inline void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv) { return; }

static inline void ubi_dbg_dump_seb(const struct ubi_scan_leb *seb,

				    int type)                        { return; }

drivers/mtd/ubi/vmt.c

+1 −1
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ fail: 
	ubi_err("paranoid check failed for volume %d", vol_id);

	if (vol)

		ubi_dump_vol_info(vol);

	ubi_dbg_dump_vtbl_record(&ubi->vtbl[vol_id], vol_id);

	ubi_dump_vtbl_record(&ubi->vtbl[vol_id], vol_id);

	dump_stack();

	spin_unlock(&ubi->volumes_lock);

	return -EINVAL;

drivers/mtd/ubi/vtbl.c

+4 −4
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int vtbl_check(const struct ubi_device *ubi, 
		if (be32_to_cpu(vtbl[i].crc) != crc) {

			ubi_err("bad CRC at record %u: %#08x, not %#08x",

				 i, crc, be32_to_cpu(vtbl[i].crc));

			ubi_dbg_dump_vtbl_record(&vtbl[i], i);

			ubi_dump_vtbl_record(&vtbl[i], i);

			return 1;

		}
@@ -277,8 +277,8 @@ static int vtbl_check(const struct ubi_device *ubi, 
			    !strncmp(vtbl[i].name, vtbl[n].name, len1)) {

				ubi_err("volumes %d and %d have the same name"

					" \"%s\"", i, n, vtbl[i].name);

				ubi_dbg_dump_vtbl_record(&vtbl[i], i);

				ubi_dbg_dump_vtbl_record(&vtbl[n], n);

				ubi_dump_vtbl_record(&vtbl[i], i);

				ubi_dump_vtbl_record(&vtbl[n], n);

				return -EINVAL;

			}

		}
@@ -288,7 +288,7 @@ static int vtbl_check(const struct ubi_device *ubi, 


bad:

	ubi_err("volume table check failed: record %d, error %d", i, err);

	ubi_dbg_dump_vtbl_record(&vtbl[i], i);

	ubi_dump_vtbl_record(&vtbl[i], i);

	return -EINVAL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE