1 files changed, 82 insertions, 76 deletions
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index 56956ec2845f..c0ed60e8ade9 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -24,7 +24,7 @@
 * changes.
 */
-#ifdef CONFIG_MTD_UBI_DEBUG_MSG
+#ifdef CONFIG_MTD_UBI_DEBUG
 #include "ubi.h"
@@ -34,14 +34,19 @@
 */
 void ubi_dbg_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr)
 {
-        dbg_msg("erase counter header dump:");
+        printk(KERN_DEBUG "Erase counter header dump:\n");
-        dbg_msg("magic          %#08x", be32_to_cpu(ec_hdr->magic));
+        printk(KERN_DEBUG "\tmagic          %#08x\n",
-        dbg_msg("version        %d",    (int)ec_hdr->version);
+               be32_to_cpu(ec_hdr->magic));
-        dbg_msg("ec             %llu",  (long long)be64_to_cpu(ec_hdr->ec));
+        printk(KERN_DEBUG "\tversion        %d\n", (int)ec_hdr->version);
-        dbg_msg("vid_hdr_offset %d",    be32_to_cpu(ec_hdr->vid_hdr_offset));
+        printk(KERN_DEBUG "\tec             %llu\n",
-        dbg_msg("data_offset    %d",    be32_to_cpu(ec_hdr->data_offset));
+               (long long)be64_to_cpu(ec_hdr->ec));
-        dbg_msg("hdr_crc        %#08x", be32_to_cpu(ec_hdr->hdr_crc));
+        printk(KERN_DEBUG "\tvid_hdr_offset %d\n",
-        dbg_msg("erase counter header hexdump:");
+               be32_to_cpu(ec_hdr->vid_hdr_offset));
+        printk(KERN_DEBUG "\tdata_offset    %d\n",
+               be32_to_cpu(ec_hdr->data_offset));
+        printk(KERN_DEBUG "\thdr_crc        %#08x\n",
+               be32_to_cpu(ec_hdr->hdr_crc));
+        printk(KERN_DEBUG "erase counter header hexdump:\n");
        print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1,
                       ec_hdr, UBI_EC_HDR_SIZE, 1);
 }
@@ -52,22 +57,23 @@ void ubi_dbg_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr)
 */
 void ubi_dbg_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr)
 {
-        dbg_msg("volume identifier header dump:");
+        printk(KERN_DEBUG "Volume identifier header dump:\n");
-        dbg_msg("magic     %08x", be32_to_cpu(vid_hdr->magic));
+        printk(KERN_DEBUG "\tmagic     %08x\n", be32_to_cpu(vid_hdr->magic));
-        dbg_msg("version   %d",   (int)vid_hdr->version);
+        printk(KERN_DEBUG "\tversion   %d\n",   (int)vid_hdr->version);
-        dbg_msg("vol_type  %d",   (int)vid_hdr->vol_type);
+        printk(KERN_DEBUG "\tvol_type  %d\n",   (int)vid_hdr->vol_type);
-        dbg_msg("copy_flag %d",   (int)vid_hdr->copy_flag);
+        printk(KERN_DEBUG "\tcopy_flag %d\n",   (int)vid_hdr->copy_flag);
-        dbg_msg("compat    %d",   (int)vid_hdr->compat);
+        printk(KERN_DEBUG "\tcompat    %d\n",   (int)vid_hdr->compat);
-        dbg_msg("vol_id    %d",   be32_to_cpu(vid_hdr->vol_id));
+        printk(KERN_DEBUG "\tvol_id    %d\n",   be32_to_cpu(vid_hdr->vol_id));
-        dbg_msg("lnum      %d",   be32_to_cpu(vid_hdr->lnum));
+        printk(KERN_DEBUG "\tlnum      %d\n",   be32_to_cpu(vid_hdr->lnum));
-        dbg_msg("leb_ver   %u",   be32_to_cpu(vid_hdr->leb_ver));
+        printk(KERN_DEBUG "\tdata_size %d\n",   be32_to_cpu(vid_hdr->data_size));
-        dbg_msg("data_size %d",   be32_to_cpu(vid_hdr->data_size));
+        printk(KERN_DEBUG "\tused_ebs  %d\n",   be32_to_cpu(vid_hdr->used_ebs));
-        dbg_msg("used_ebs  %d",   be32_to_cpu(vid_hdr->used_ebs));
+        printk(KERN_DEBUG "\tdata_pad  %d\n",   be32_to_cpu(vid_hdr->data_pad));
-        dbg_msg("data_pad  %d",   be32_to_cpu(vid_hdr->data_pad));
+        printk(KERN_DEBUG "\tsqnum     %llu\n",
-        dbg_msg("sqnum     %llu",
                (unsigned long long)be64_to_cpu(vid_hdr->sqnum));
-        dbg_msg("hdr_crc   %08x", be32_to_cpu(vid_hdr->hdr_crc));
+        printk(KERN_DEBUG "\thdr_crc   %08x\n", be32_to_cpu(vid_hdr->hdr_crc));
-        dbg_msg("volume identifier header hexdump:");
+        printk(KERN_DEBUG "Volume identifier header hexdump:\n");
+        print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1,
+                       vid_hdr, UBI_VID_HDR_SIZE, 1);
 }
 /**
@@ -76,27 +82,27 @@ void ubi_dbg_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr)
 */
 void ubi_dbg_dump_vol_info(const struct ubi_volume *vol)
 {
-        dbg_msg("volume information dump:");
+        printk(KERN_DEBUG "Volume information dump:\n");
-        dbg_msg("vol_id          %d", vol->vol_id);
+        printk(KERN_DEBUG "\tvol_id          %d\n", vol->vol_id);
-        dbg_msg("reserved_pebs   %d", vol->reserved_pebs);
+        printk(KERN_DEBUG "\treserved_pebs   %d\n", vol->reserved_pebs);
-        dbg_msg("alignment       %d", vol->alignment);
+        printk(KERN_DEBUG "\talignment       %d\n", vol->alignment);
-        dbg_msg("data_pad        %d", vol->data_pad);
+        printk(KERN_DEBUG "\tdata_pad        %d\n", vol->data_pad);
-        dbg_msg("vol_type        %d", vol->vol_type);
+        printk(KERN_DEBUG "\tvol_type        %d\n", vol->vol_type);
-        dbg_msg("name_len        %d", vol->name_len);
+        printk(KERN_DEBUG "\tname_len        %d\n", vol->name_len);
-        dbg_msg("usable_leb_size %d", vol->usable_leb_size);
+        printk(KERN_DEBUG "\tusable_leb_size %d\n", vol->usable_leb_size);
-        dbg_msg("used_ebs        %d", vol->used_ebs);
+        printk(KERN_DEBUG "\tused_ebs        %d\n", vol->used_ebs);
-        dbg_msg("used_bytes      %lld", vol->used_bytes);
+        printk(KERN_DEBUG "\tused_bytes      %lld\n", vol->used_bytes);
-        dbg_msg("last_eb_bytes   %d", vol->last_eb_bytes);
+        printk(KERN_DEBUG "\tlast_eb_bytes   %d\n", vol->last_eb_bytes);
-        dbg_msg("corrupted       %d", vol->corrupted);
+        printk(KERN_DEBUG "\tcorrupted       %d\n", vol->corrupted);
-        dbg_msg("upd_marker      %d", vol->upd_marker);
+        printk(KERN_DEBUG "\tupd_marker      %d\n", vol->upd_marker);
        if (vol->name_len <= UBI_VOL_NAME_MAX &&
            strnlen(vol->name, vol->name_len + 1) == vol->name_len) {
-                dbg_msg("name            %s", vol->name);
+                printk(KERN_DEBUG "\tname            %s\n", vol->name);
        } else {
-                dbg_msg("the 1st 5 characters of the name: %c%c%c%c%c",
+                printk(KERN_DEBUG "\t1st 5 characters of name: %c%c%c%c%c\n",
-                        vol->name[0], vol->name[1], vol->name[2],
+                       vol->name[0], vol->name[1], vol->name[2],
-                        vol->name[3], vol->name[4]);
+                       vol->name[3], vol->name[4]);
        }
 }
@@ -109,28 +115,29 @@ void ubi_dbg_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx)
 {
        int name_len = be16_to_cpu(r->name_len);
-        dbg_msg("volume table record %d dump:", idx);
+        printk(KERN_DEBUG "Volume table record %d dump:\n", idx);
-        dbg_msg("reserved_pebs   %d", be32_to_cpu(r->reserved_pebs));
+        printk(KERN_DEBUG "\treserved_pebs   %d\n",
-        dbg_msg("alignment       %d", be32_to_cpu(r->alignment));
+               be32_to_cpu(r->reserved_pebs));
-        dbg_msg("data_pad        %d", be32_to_cpu(r->data_pad));
+        printk(KERN_DEBUG "\talignment       %d\n", be32_to_cpu(r->alignment));
-        dbg_msg("vol_type        %d", (int)r->vol_type);
+        printk(KERN_DEBUG "\tdata_pad        %d\n", be32_to_cpu(r->data_pad));
-        dbg_msg("upd_marker      %d", (int)r->upd_marker);
+        printk(KERN_DEBUG "\tvol_type        %d\n", (int)r->vol_type);
-        dbg_msg("name_len        %d", name_len);
+        printk(KERN_DEBUG "\tupd_marker      %d\n", (int)r->upd_marker);
+        printk(KERN_DEBUG "\tname_len        %d\n", name_len);
        if (r->name[0] == '\0') {
-                dbg_msg("name            NULL");
+                printk(KERN_DEBUG "\tname            NULL\n");
                return;
        }
        if (name_len <= UBI_VOL_NAME_MAX &&
            strnlen(&r->name[0], name_len + 1) == name_len) {
-                dbg_msg("name            %s", &r->name[0]);
+                printk(KERN_DEBUG "\tname            %s\n", &r->name[0]);
        } else {
-                dbg_msg("1st 5 characters of the name: %c%c%c%c%c",
+                printk(KERN_DEBUG "\t1st 5 characters of name: %c%c%c%c%c\n",
                        r->name[0], r->name[1], r->name[2], r->name[3],
                        r->name[4]);
        }
-        dbg_msg("crc             %#08x", be32_to_cpu(r->crc));
+        printk(KERN_DEBUG "\tcrc             %#08x\n", be32_to_cpu(r->crc));
 }
 /**
@@ -139,15 +146,15 @@ void ubi_dbg_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx)
 */
 void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv)
 {
-        dbg_msg("volume scanning information dump:");
+        printk(KERN_DEBUG "Volume scanning information dump:\n");
-        dbg_msg("vol_id         %d", sv->vol_id);
+        printk(KERN_DEBUG "\tvol_id         %d\n", sv->vol_id);
-        dbg_msg("highest_lnum   %d", sv->highest_lnum);
+        printk(KERN_DEBUG "\thighest_lnum   %d\n", sv->highest_lnum);
-        dbg_msg("leb_count      %d", sv->leb_count);
+        printk(KERN_DEBUG "\tleb_count      %d\n", sv->leb_count);
-        dbg_msg("compat         %d", sv->compat);
+        printk(KERN_DEBUG "\tcompat         %d\n", sv->compat);
-        dbg_msg("vol_type       %d", sv->vol_type);
+        printk(KERN_DEBUG "\tvol_type       %d\n", sv->vol_type);
-        dbg_msg("used_ebs       %d", sv->used_ebs);
+        printk(KERN_DEBUG "\tused_ebs       %d\n", sv->used_ebs);
-        dbg_msg("last_data_size %d", sv->last_data_size);
+        printk(KERN_DEBUG "\tlast_data_size %d\n", sv->last_data_size);
-        dbg_msg("data_pad       %d", sv->data_pad);
+        printk(KERN_DEBUG "\tdata_pad       %d\n", sv->data_pad);
 }
 /**
@@ -157,14 +164,13 @@ void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv)
 */
 void ubi_dbg_dump_seb(const struct ubi_scan_leb *seb, int type)
 {
-        dbg_msg("eraseblock scanning information dump:");
+        printk(KERN_DEBUG "eraseblock scanning information dump:\n");
-        dbg_msg("ec       %d", seb->ec);
+        printk(KERN_DEBUG "\tec       %d\n", seb->ec);
-        dbg_msg("pnum     %d", seb->pnum);
+        printk(KERN_DEBUG "\tpnum     %d\n", seb->pnum);
        if (type == 0) {
-                dbg_msg("lnum     %d", seb->lnum);
+                printk(KERN_DEBUG "\tlnum     %d\n", seb->lnum);
-                dbg_msg("scrub    %d", seb->scrub);
+                printk(KERN_DEBUG "\tscrub    %d\n", seb->scrub);
-                dbg_msg("sqnum    %llu", seb->sqnum);
+                printk(KERN_DEBUG "\tsqnum    %llu\n", seb->sqnum);
-                dbg_msg("leb_ver  %u", seb->leb_ver);
        }
 }
@@ -176,16 +182,16 @@ void ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req)
 {
        char nm[17];
-        dbg_msg("volume creation request dump:");
+        printk(KERN_DEBUG "Volume creation request dump:\n");
-        dbg_msg("vol_id    %d",   req->vol_id);
+        printk(KERN_DEBUG "\tvol_id    %d\n",   req->vol_id);
-        dbg_msg("alignment %d",   req->alignment);
+        printk(KERN_DEBUG "\talignment %d\n",   req->alignment);
-        dbg_msg("bytes     %lld", (long long)req->bytes);
+        printk(KERN_DEBUG "\tbytes     %lld\n", (long long)req->bytes);
-        dbg_msg("vol_type  %d",   req->vol_type);
+        printk(KERN_DEBUG "\tvol_type  %d\n",   req->vol_type);
-        dbg_msg("name_len  %d",   req->name_len);
+        printk(KERN_DEBUG "\tname_len  %d\n",   req->name_len);
        memcpy(nm, req->name, 16);
        nm[16] = 0;
-        dbg_msg("the 1st 16 characters of the name: %s", nm);
+        printk(KERN_DEBUG "\t1st 16 characters of name: %s\n", nm);
 }
-#endif /* CONFIG_MTD_UBI_DEBUG_MSG */
+#endif /* CONFIG_MTD_UBI_DEBUG */

diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c index 56956ec2845f..c0ed60e8ade9 100644 --- a/drivers/mtd/ubi/debug.c +++ b/drivers/mtd/ubi/debug.c
@@ -24,7 +24,7 @@
24	* changes.	24	* changes.
25	*/	25	*/
26		26
27	#ifdef CONFIG_MTD_UBI_DEBUG_MSG	27	#ifdef CONFIG_MTD_UBI_DEBUG
28		28
29	#include "ubi.h"	29	#include "ubi.h"
30		30
@@ -34,14 +34,19 @@
34	*/	34	*/
35	void ubi_dbg_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr)	35	void ubi_dbg_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr)
36	{	36	{
37	dbg_msg("erase counter header dump:");	37	printk(KERN_DEBUG "Erase counter header dump:\n");
38	dbg_msg("magic %#08x", be32_to_cpu(ec_hdr->magic));	38	printk(KERN_DEBUG "\tmagic %#08x\n",
39	dbg_msg("version %d", (int)ec_hdr->version);	39	be32_to_cpu(ec_hdr->magic));
40	dbg_msg("ec %llu", (long long)be64_to_cpu(ec_hdr->ec));	40	printk(KERN_DEBUG "\tversion %d\n", (int)ec_hdr->version);
41	dbg_msg("vid_hdr_offset %d", be32_to_cpu(ec_hdr->vid_hdr_offset));	41	printk(KERN_DEBUG "\tec %llu\n",
42	dbg_msg("data_offset %d", be32_to_cpu(ec_hdr->data_offset));	42	(long long)be64_to_cpu(ec_hdr->ec));
43	dbg_msg("hdr_crc %#08x", be32_to_cpu(ec_hdr->hdr_crc));	43	printk(KERN_DEBUG "\tvid_hdr_offset %d\n",
44	dbg_msg("erase counter header hexdump:");	44	be32_to_cpu(ec_hdr->vid_hdr_offset));
		45	printk(KERN_DEBUG "\tdata_offset %d\n",
		46	be32_to_cpu(ec_hdr->data_offset));
		47	printk(KERN_DEBUG "\thdr_crc %#08x\n",
		48	be32_to_cpu(ec_hdr->hdr_crc));
		49	printk(KERN_DEBUG "erase counter header hexdump:\n");
45	print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1,	50	print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1,
46	ec_hdr, UBI_EC_HDR_SIZE, 1);	51	ec_hdr, UBI_EC_HDR_SIZE, 1);
47	}	52	}
@@ -52,22 +57,23 @@ void ubi_dbg_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr)
52	*/	57	*/
53	void ubi_dbg_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr)	58	void ubi_dbg_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr)
54	{	59	{
55	dbg_msg("volume identifier header dump:");	60	printk(KERN_DEBUG "Volume identifier header dump:\n");
56	dbg_msg("magic %08x", be32_to_cpu(vid_hdr->magic));	61	printk(KERN_DEBUG "\tmagic %08x\n", be32_to_cpu(vid_hdr->magic));
57	dbg_msg("version %d", (int)vid_hdr->version);	62	printk(KERN_DEBUG "\tversion %d\n", (int)vid_hdr->version);
58	dbg_msg("vol_type %d", (int)vid_hdr->vol_type);	63	printk(KERN_DEBUG "\tvol_type %d\n", (int)vid_hdr->vol_type);
59	dbg_msg("copy_flag %d", (int)vid_hdr->copy_flag);	64	printk(KERN_DEBUG "\tcopy_flag %d\n", (int)vid_hdr->copy_flag);
60	dbg_msg("compat %d", (int)vid_hdr->compat);	65	printk(KERN_DEBUG "\tcompat %d\n", (int)vid_hdr->compat);
61	dbg_msg("vol_id %d", be32_to_cpu(vid_hdr->vol_id));	66	printk(KERN_DEBUG "\tvol_id %d\n", be32_to_cpu(vid_hdr->vol_id));
62	dbg_msg("lnum %d", be32_to_cpu(vid_hdr->lnum));	67	printk(KERN_DEBUG "\tlnum %d\n", be32_to_cpu(vid_hdr->lnum));
63	dbg_msg("leb_ver %u", be32_to_cpu(vid_hdr->leb_ver));	68	printk(KERN_DEBUG "\tdata_size %d\n", be32_to_cpu(vid_hdr->data_size));
64	dbg_msg("data_size %d", be32_to_cpu(vid_hdr->data_size));	69	printk(KERN_DEBUG "\tused_ebs %d\n", be32_to_cpu(vid_hdr->used_ebs));
65	dbg_msg("used_ebs %d", be32_to_cpu(vid_hdr->used_ebs));	70	printk(KERN_DEBUG "\tdata_pad %d\n", be32_to_cpu(vid_hdr->data_pad));
66	dbg_msg("data_pad %d", be32_to_cpu(vid_hdr->data_pad));	71	printk(KERN_DEBUG "\tsqnum %llu\n",
67	dbg_msg("sqnum %llu",
68	(unsigned long long)be64_to_cpu(vid_hdr->sqnum));	72	(unsigned long long)be64_to_cpu(vid_hdr->sqnum));
69	dbg_msg("hdr_crc %08x", be32_to_cpu(vid_hdr->hdr_crc));	73	printk(KERN_DEBUG "\thdr_crc %08x\n", be32_to_cpu(vid_hdr->hdr_crc));
70	dbg_msg("volume identifier header hexdump:");	74	printk(KERN_DEBUG "Volume identifier header hexdump:\n");
		75	print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1,
		76	vid_hdr, UBI_VID_HDR_SIZE, 1);
71	}	77	}
72		78
73	/**	79	/**
@@ -76,27 +82,27 @@ void ubi_dbg_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr)
76	*/	82	*/
77	void ubi_dbg_dump_vol_info(const struct ubi_volume *vol)	83	void ubi_dbg_dump_vol_info(const struct ubi_volume *vol)
78	{	84	{
79	dbg_msg("volume information dump:");	85	printk(KERN_DEBUG "Volume information dump:\n");
80	dbg_msg("vol_id %d", vol->vol_id);	86	printk(KERN_DEBUG "\tvol_id %d\n", vol->vol_id);
81	dbg_msg("reserved_pebs %d", vol->reserved_pebs);	87	printk(KERN_DEBUG "\treserved_pebs %d\n", vol->reserved_pebs);
82	dbg_msg("alignment %d", vol->alignment);	88	printk(KERN_DEBUG "\talignment %d\n", vol->alignment);
83	dbg_msg("data_pad %d", vol->data_pad);	89	printk(KERN_DEBUG "\tdata_pad %d\n", vol->data_pad);
84	dbg_msg("vol_type %d", vol->vol_type);	90	printk(KERN_DEBUG "\tvol_type %d\n", vol->vol_type);
85	dbg_msg("name_len %d", vol->name_len);	91	printk(KERN_DEBUG "\tname_len %d\n", vol->name_len);
86	dbg_msg("usable_leb_size %d", vol->usable_leb_size);	92	printk(KERN_DEBUG "\tusable_leb_size %d\n", vol->usable_leb_size);
87	dbg_msg("used_ebs %d", vol->used_ebs);	93	printk(KERN_DEBUG "\tused_ebs %d\n", vol->used_ebs);
88	dbg_msg("used_bytes %lld", vol->used_bytes);	94	printk(KERN_DEBUG "\tused_bytes %lld\n", vol->used_bytes);
89	dbg_msg("last_eb_bytes %d", vol->last_eb_bytes);	95	printk(KERN_DEBUG "\tlast_eb_bytes %d\n", vol->last_eb_bytes);
90	dbg_msg("corrupted %d", vol->corrupted);	96	printk(KERN_DEBUG "\tcorrupted %d\n", vol->corrupted);
91	dbg_msg("upd_marker %d", vol->upd_marker);	97	printk(KERN_DEBUG "\tupd_marker %d\n", vol->upd_marker);
92		98
93	if (vol->name_len <= UBI_VOL_NAME_MAX &&	99	if (vol->name_len <= UBI_VOL_NAME_MAX &&
94	strnlen(vol->name, vol->name_len + 1) == vol->name_len) {	100	strnlen(vol->name, vol->name_len + 1) == vol->name_len) {
95	dbg_msg("name %s", vol->name);	101	printk(KERN_DEBUG "\tname %s\n", vol->name);
96	} else {	102	} else {
97	dbg_msg("the 1st 5 characters of the name: %c%c%c%c%c",	103	printk(KERN_DEBUG "\t1st 5 characters of name: %c%c%c%c%c\n",
98	vol->name[0], vol->name[1], vol->name[2],	104	vol->name[0], vol->name[1], vol->name[2],
99	vol->name[3], vol->name[4]);	105	vol->name[3], vol->name[4]);
100	}	106	}
101	}	107	}
102		108
@@ -109,28 +115,29 @@ void ubi_dbg_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx)
109	{	115	{
110	int name_len = be16_to_cpu(r->name_len);	116	int name_len = be16_to_cpu(r->name_len);
111		117
112	dbg_msg("volume table record %d dump:", idx);	118	printk(KERN_DEBUG "Volume table record %d dump:\n", idx);
113	dbg_msg("reserved_pebs %d", be32_to_cpu(r->reserved_pebs));	119	printk(KERN_DEBUG "\treserved_pebs %d\n",
114	dbg_msg("alignment %d", be32_to_cpu(r->alignment));	120	be32_to_cpu(r->reserved_pebs));
115	dbg_msg("data_pad %d", be32_to_cpu(r->data_pad));	121	printk(KERN_DEBUG "\talignment %d\n", be32_to_cpu(r->alignment));
116	dbg_msg("vol_type %d", (int)r->vol_type);	122	printk(KERN_DEBUG "\tdata_pad %d\n", be32_to_cpu(r->data_pad));
117	dbg_msg("upd_marker %d", (int)r->upd_marker);	123	printk(KERN_DEBUG "\tvol_type %d\n", (int)r->vol_type);
118	dbg_msg("name_len %d", name_len);	124	printk(KERN_DEBUG "\tupd_marker %d\n", (int)r->upd_marker);
		125	printk(KERN_DEBUG "\tname_len %d\n", name_len);
119		126
120	if (r->name[0] == '\0') {	127	if (r->name[0] == '\0') {
121	dbg_msg("name NULL");	128	printk(KERN_DEBUG "\tname NULL\n");
122	return;	129	return;
123	}	130	}
124		131
125	if (name_len <= UBI_VOL_NAME_MAX &&	132	if (name_len <= UBI_VOL_NAME_MAX &&
126	strnlen(&r->name[0], name_len + 1) == name_len) {	133	strnlen(&r->name[0], name_len + 1) == name_len) {
127	dbg_msg("name %s", &r->name[0]);	134	printk(KERN_DEBUG "\tname %s\n", &r->name[0]);
128	} else {	135	} else {
129	dbg_msg("1st 5 characters of the name: %c%c%c%c%c",	136	printk(KERN_DEBUG "\t1st 5 characters of name: %c%c%c%c%c\n",
130	r->name[0], r->name[1], r->name[2], r->name[3],	137	r->name[0], r->name[1], r->name[2], r->name[3],
131	r->name[4]);	138	r->name[4]);
132	}	139	}
133	dbg_msg("crc %#08x", be32_to_cpu(r->crc));	140	printk(KERN_DEBUG "\tcrc %#08x\n", be32_to_cpu(r->crc));
134	}	141	}
135		142
136	/**	143	/**
@@ -139,15 +146,15 @@ void ubi_dbg_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx)
139	*/	146	*/
140	void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv)	147	void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv)
141	{	148	{
142	dbg_msg("volume scanning information dump:");	149	printk(KERN_DEBUG "Volume scanning information dump:\n");
143	dbg_msg("vol_id %d", sv->vol_id);	150	printk(KERN_DEBUG "\tvol_id %d\n", sv->vol_id);
144	dbg_msg("highest_lnum %d", sv->highest_lnum);	151	printk(KERN_DEBUG "\thighest_lnum %d\n", sv->highest_lnum);
145	dbg_msg("leb_count %d", sv->leb_count);	152	printk(KERN_DEBUG "\tleb_count %d\n", sv->leb_count);
146	dbg_msg("compat %d", sv->compat);	153	printk(KERN_DEBUG "\tcompat %d\n", sv->compat);
147	dbg_msg("vol_type %d", sv->vol_type);	154	printk(KERN_DEBUG "\tvol_type %d\n", sv->vol_type);
148	dbg_msg("used_ebs %d", sv->used_ebs);	155	printk(KERN_DEBUG "\tused_ebs %d\n", sv->used_ebs);
149	dbg_msg("last_data_size %d", sv->last_data_size);	156	printk(KERN_DEBUG "\tlast_data_size %d\n", sv->last_data_size);
150	dbg_msg("data_pad %d", sv->data_pad);	157	printk(KERN_DEBUG "\tdata_pad %d\n", sv->data_pad);
151	}	158	}
152		159
153	/**	160	/**
@@ -157,14 +164,13 @@ void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv)
157	*/	164	*/
158	void ubi_dbg_dump_seb(const struct ubi_scan_leb *seb, int type)	165	void ubi_dbg_dump_seb(const struct ubi_scan_leb *seb, int type)
159	{	166	{
160	dbg_msg("eraseblock scanning information dump:");	167	printk(KERN_DEBUG "eraseblock scanning information dump:\n");
161	dbg_msg("ec %d", seb->ec);	168	printk(KERN_DEBUG "\tec %d\n", seb->ec);
162	dbg_msg("pnum %d", seb->pnum);	169	printk(KERN_DEBUG "\tpnum %d\n", seb->pnum);
163	if (type == 0) {	170	if (type == 0) {
164	dbg_msg("lnum %d", seb->lnum);	171	printk(KERN_DEBUG "\tlnum %d\n", seb->lnum);
165	dbg_msg("scrub %d", seb->scrub);	172	printk(KERN_DEBUG "\tscrub %d\n", seb->scrub);
166	dbg_msg("sqnum %llu", seb->sqnum);	173	printk(KERN_DEBUG "\tsqnum %llu\n", seb->sqnum);
167	dbg_msg("leb_ver %u", seb->leb_ver);
168	}	174	}
169	}	175	}
170		176
@@ -176,16 +182,16 @@ void ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req)
176	{	182	{
177	char nm[17];	183	char nm[17];
178		184
179	dbg_msg("volume creation request dump:");	185	printk(KERN_DEBUG "Volume creation request dump:\n");
180	dbg_msg("vol_id %d", req->vol_id);	186	printk(KERN_DEBUG "\tvol_id %d\n", req->vol_id);
181	dbg_msg("alignment %d", req->alignment);	187	printk(KERN_DEBUG "\talignment %d\n", req->alignment);
182	dbg_msg("bytes %lld", (long long)req->bytes);	188	printk(KERN_DEBUG "\tbytes %lld\n", (long long)req->bytes);
183	dbg_msg("vol_type %d", req->vol_type);	189	printk(KERN_DEBUG "\tvol_type %d\n", req->vol_type);
184	dbg_msg("name_len %d", req->name_len);	190	printk(KERN_DEBUG "\tname_len %d\n", req->name_len);
185		191
186	memcpy(nm, req->name, 16);	192	memcpy(nm, req->name, 16);
187	nm[16] = 0;	193	nm[16] = 0;
188	dbg_msg("the 1st 16 characters of the name: %s", nm);	194	printk(KERN_DEBUG "\t1st 16 characters of name: %s\n", nm);
189	}	195	}
190		196
191	#endif /* CONFIG_MTD_UBI_DEBUG_MSG */	197	#endif /* CONFIG_MTD_UBI_DEBUG */