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

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

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

diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c
index c26b1add508d0d480d296662392f4f81c15f6fca..23f7ad2d708930c52f3f57c80a33a0412da52739 100644 (file)
--- a/drivers/mtd/ubi/scan.c
+++ b/drivers/mtd/ubi/scan.c
@@ -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:

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