From 34ef994c2acd802860ab3e8ad3ecdced38008b9b Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Wed, 16 May 2012 18:03:32 +0300 Subject: [PATCH] --- yaml --- r: 305159 b: refs/heads/master c: 718c00bb8fb00c68977f1076619cdfb050f92ba5 h: refs/heads/master i: 305157: 391a478d14de8fc77f2a2b25472741c14eb1e7c0 305155: 04cc1593c583956802598867444e2e90d5501d0c 305151: 19a987b541cab7be76d8bdb054989b08c0713595 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/ubi/cdev.c | 2 +- trunk/drivers/mtd/ubi/debug.c | 4 ++-- trunk/drivers/mtd/ubi/debug.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 4fc5077ac8da..97b83269cdf5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b989bd4c572ab700e8c67842c37abc7738641310 +refs/heads/master: 718c00bb8fb00c68977f1076619cdfb050f92ba5 diff --git a/trunk/drivers/mtd/ubi/cdev.c b/trunk/drivers/mtd/ubi/cdev.c index f4061126926b..633ac82bbd22 100644 --- a/trunk/drivers/mtd/ubi/cdev.c +++ b/trunk/drivers/mtd/ubi/cdev.c @@ -644,7 +644,7 @@ static int verify_mkvol_req(const struct ubi_device *ubi, bad: dbg_err("bad volume creation request"); - ubi_dbg_dump_mkvol_req(req); + ubi_dump_mkvol_req(req); return err; } diff --git a/trunk/drivers/mtd/ubi/debug.c b/trunk/drivers/mtd/ubi/debug.c index d33a2831cc07..bb7297ebf1c1 100644 --- a/trunk/drivers/mtd/ubi/debug.c +++ b/trunk/drivers/mtd/ubi/debug.c @@ -207,10 +207,10 @@ void ubi_dump_seb(const struct ubi_scan_leb *seb, int type) } /** - * ubi_dbg_dump_mkvol_req - dump a &struct ubi_mkvol_req object. + * ubi_dump_mkvol_req - dump a &struct ubi_mkvol_req object. * @req: the object to dump */ -void ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req) +void ubi_dump_mkvol_req(const struct ubi_mkvol_req *req) { char nm[17]; diff --git a/trunk/drivers/mtd/ubi/debug.h b/trunk/drivers/mtd/ubi/debug.h index b897c4ab7dc9..c98d2c8d3abe 100644 --- a/trunk/drivers/mtd/ubi/debug.h +++ b/trunk/drivers/mtd/ubi/debug.h @@ -64,7 +64,7 @@ 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_dump_sv(const struct ubi_scan_volume *sv); void ubi_dump_seb(const struct ubi_scan_leb *seb, int type); -void ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req); +void ubi_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); int ubi_dbg_check_write(struct ubi_device *ubi, const void *buf, int pnum, int offset, int len); @@ -201,7 +201,7 @@ static inline void ubi_dump_sv(const struct ubi_scan_volume *sv) { return; } static inline void ubi_dump_seb(const struct ubi_scan_leb *seb, int type) { return; } static inline void -ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req) { return; } +ubi_dump_mkvol_req(const struct ubi_mkvol_req *req) { return; } static inline void ubi_dbg_print_hex_dump(const char *l, const char *ps, int pt, int r, int g, const void *b, size_t len, bool a) { return; }