Commit 614c74a7 authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBI: rename ubi_dbg_dump_sv 



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_sv()' to 'ubi_dump_sv()'.

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

drivers/mtd/ubi/debug.c

+2 −2
Original line number Diff line number Diff line
@@ -173,10 +173,10 @@ void ubi_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx) 
}



/**

 * ubi_dbg_dump_sv - dump a &struct ubi_scan_volume object.

 * ubi_dump_sv - dump a &struct ubi_scan_volume object.

 * @sv: the object to dump

 */

void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv)

void ubi_dump_sv(const struct ubi_scan_volume *sv)

{

	printk(KERN_DEBUG "Volume scanning information dump:\n");

	printk(KERN_DEBUG "\tvol_id         %d\n", sv->vol_id);

drivers/mtd/ubi/debug.h

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr); 


void ubi_dump_vol_info(const struct ubi_volume *vol);

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_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);

int ubi_dbg_check_all_ff(struct ubi_device *ubi, int pnum, int offset, int len);
@@ -197,7 +197,7 @@ 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_dbg_dump_sv(const struct ubi_scan_volume *sv) { return; }

static inline void ubi_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; }

static inline void

drivers/mtd/ubi/scan.c

+4 −4
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ static int validate_vid_hdr(const struct ubi_vid_hdr *vid_hdr, 
bad:

	ubi_err("inconsistent VID header at PEB %d", pnum);

	ubi_dump_vid_hdr(vid_hdr);

	ubi_dbg_dump_sv(sv);

	ubi_dump_sv(sv);

	return -EINVAL;

}
@@ -1584,17 +1584,17 @@ static int paranoid_check_si(struct ubi_device *ubi, struct ubi_scan_info *si) 
bad_seb:

	ubi_err("bad scanning information about LEB %d", seb->lnum);

	ubi_dbg_dump_seb(seb, 0);

	ubi_dbg_dump_sv(sv);

	ubi_dump_sv(sv);

	goto out;



bad_sv:

	ubi_err("bad scanning information about volume %d", sv->vol_id);

	ubi_dbg_dump_sv(sv);

	ubi_dump_sv(sv);

	goto out;



bad_vid_hdr:

	ubi_err("bad scanning information about volume %d", sv->vol_id);

	ubi_dbg_dump_sv(sv);

	ubi_dump_sv(sv);

	ubi_dump_vid_hdr(vidh);



out:

drivers/mtd/ubi/vtbl.c

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ static int check_sv(const struct ubi_volume *vol, 


bad:

	ubi_err("bad scanning information, error %d", err);

	ubi_dbg_dump_sv(sv);

	ubi_dump_sv(sv);

	ubi_dump_vol_info(vol);

	return -EINVAL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE