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: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index 2d3dc2624b61aeccfa455703c96f741018a0f000..9b16bcc1b172d1eba99599f523c0fd47008eaffb 100644 (file)
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -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);
 

diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h
index ca36f2db2b0e828d8924dd4487aaeccd1f35c6a2..9728da4444ccb2644876a7393b3d6a8ce1944e26 100644 (file)
--- a/drivers/mtd/ubi/debug.h
+++ b/drivers/mtd/ubi/debug.h
@@ -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; }

diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 906f972f950ae901065e0aae06c8f77d0de6b658..a4b4c300a4e18c6eee3e2b0ad84a33356bc4fa9e 100644 (file)
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -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;

diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index 7ef3de0ffbf71b751bd37a298c5892cafc047263..897502fba301d70e643efc6dd1bf776b6e09d7bb 100644 (file)
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -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;
 }