UBI: rename ubi_dbg_dump_vol_info

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_vol_info()' to 'ubi_dump_vol_info()'.

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 dce463d3c586c72d2e75fed66a5d065c6176f1d3..2d3dc2624b61aeccfa455703c96f741018a0f000 100644 (file)
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -109,10 +109,10 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr)
 #ifdef CONFIG_MTD_UBI_DEBUG
 
 /**
- * ubi_dbg_dump_vol_info- dump volume information.
+ * ubi_dump_vol_info - dump volume information.
  * @vol: UBI volume description object
  */
-void ubi_dbg_dump_vol_info(const struct ubi_volume *vol)
+void ubi_dump_vol_info(const struct ubi_volume *vol)
 {
        printk(KERN_DEBUG "Volume information dump:\n");
        printk(KERN_DEBUG "\tvol_id          %d\n", vol->vol_id);

diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h
index b8672c947bb54a3c037649c1e224a57451ec1b5e..ca36f2db2b0e828d8924dd4487aaeccd1f35c6a2 100644 (file)
--- a/drivers/mtd/ubi/debug.h
+++ b/drivers/mtd/ubi/debug.h
@@ -60,7 +60,7 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr);
 /* Initialization and build messages */
 #define dbg_bld(fmt, ...) ubi_dbg_msg("bld", fmt, ##__VA_ARGS__)
 
-void ubi_dbg_dump_vol_info(const struct ubi_volume *vol);
+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_dbg_dump_sv(const struct ubi_scan_volume *sv);
 void ubi_dbg_dump_seb(const struct ubi_scan_leb *seb, int type);
@@ -194,7 +194,7 @@ static inline int ubi_dbg_is_erase_failure(const struct ubi_device *ubi)
 #define dbg_bld(fmt, ...)  ubi_dbg_msg(fmt, ##__VA_ARGS__)
 
 static inline void
-ubi_dbg_dump_vol_info(const struct ubi_volume *vol)                  { return; }
+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; }
 static inline void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv) { return; }

diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 863835f4aefea5aa6cd4fc481d36092d09a0509e..906f972f950ae901065e0aae06c8f77d0de6b658 100644 (file)
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -855,7 +855,7 @@ static int paranoid_check_volume(struct ubi_device *ubi, int vol_id)
 fail:
        ubi_err("paranoid check failed for volume %d", vol_id);
        if (vol)
-               ubi_dbg_dump_vol_info(vol);
+               ubi_dump_vol_info(vol);
        ubi_dbg_dump_vtbl_record(&ubi->vtbl[vol_id], vol_id);
        dump_stack();
        spin_unlock(&ubi->volumes_lock);

diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c
index a6f4b13d841749e49b2c1d811178af08b69bb08d..7ef3de0ffbf71b751bd37a298c5892cafc047263 100644 (file)
--- a/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@ -701,7 +701,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_dbg_dump_vol_info(vol);
+       ubi_dump_vol_info(vol);
        return -EINVAL;
 }