diff options
Diffstat (limited to 'drivers/mtd/ubi')
-rw-r--r-- | drivers/mtd/ubi/debug.c | 4 | ||||
-rw-r--r-- | drivers/mtd/ubi/debug.h | 4 | ||||
-rw-r--r-- | drivers/mtd/ubi/scan.c | 8 | ||||
-rw-r--r-- | drivers/mtd/ubi/vtbl.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c index 9b16bcc1b172..9ae8fff98f49 100644 --- 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) | |||
173 | } | 173 | } |
174 | 174 | ||
175 | /** | 175 | /** |
176 | * ubi_dbg_dump_sv - dump a &struct ubi_scan_volume object. | 176 | * ubi_dump_sv - dump a &struct ubi_scan_volume object. |
177 | * @sv: the object to dump | 177 | * @sv: the object to dump |
178 | */ | 178 | */ |
179 | void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv) | 179 | void ubi_dump_sv(const struct ubi_scan_volume *sv) |
180 | { | 180 | { |
181 | printk(KERN_DEBUG "Volume scanning information dump:\n"); | 181 | printk(KERN_DEBUG "Volume scanning information dump:\n"); |
182 | printk(KERN_DEBUG "\tvol_id %d\n", sv->vol_id); | 182 | 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 9728da4444cc..5e3d4e88d7be 100644 --- 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); | |||
62 | 62 | ||
63 | void ubi_dump_vol_info(const struct ubi_volume *vol); | 63 | void ubi_dump_vol_info(const struct ubi_volume *vol); |
64 | void ubi_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx); | 64 | void ubi_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx); |
65 | void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv); | 65 | void ubi_dump_sv(const struct ubi_scan_volume *sv); |
66 | void ubi_dbg_dump_seb(const struct ubi_scan_leb *seb, int type); | 66 | void ubi_dbg_dump_seb(const struct ubi_scan_leb *seb, int type); |
67 | void ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req); | 67 | void ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req); |
68 | int ubi_dbg_check_all_ff(struct ubi_device *ubi, int pnum, int offset, int len); | 68 | int ubi_dbg_check_all_ff(struct ubi_device *ubi, int pnum, int offset, int len); |
@@ -197,7 +197,7 @@ static inline void | |||
197 | ubi_dump_vol_info(const struct ubi_volume *vol) { return; } | 197 | ubi_dump_vol_info(const struct ubi_volume *vol) { return; } |
198 | static inline void | 198 | static inline void |
199 | ubi_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx) { return; } | 199 | ubi_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx) { return; } |
200 | static inline void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv) { return; } | 200 | static inline void ubi_dump_sv(const struct ubi_scan_volume *sv) { return; } |
201 | static inline void ubi_dbg_dump_seb(const struct ubi_scan_leb *seb, | 201 | static inline void ubi_dbg_dump_seb(const struct ubi_scan_leb *seb, |
202 | int type) { return; } | 202 | int type) { return; } |
203 | static inline void | 203 | static inline void |
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c index c26b1add508d..23f7ad2d7089 100644 --- 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, | |||
231 | bad: | 231 | bad: |
232 | ubi_err("inconsistent VID header at PEB %d", pnum); | 232 | ubi_err("inconsistent VID header at PEB %d", pnum); |
233 | ubi_dump_vid_hdr(vid_hdr); | 233 | ubi_dump_vid_hdr(vid_hdr); |
234 | ubi_dbg_dump_sv(sv); | 234 | ubi_dump_sv(sv); |
235 | return -EINVAL; | 235 | return -EINVAL; |
236 | } | 236 | } |
237 | 237 | ||
@@ -1584,17 +1584,17 @@ static int paranoid_check_si(struct ubi_device *ubi, struct ubi_scan_info *si) | |||
1584 | bad_seb: | 1584 | bad_seb: |
1585 | ubi_err("bad scanning information about LEB %d", seb->lnum); | 1585 | ubi_err("bad scanning information about LEB %d", seb->lnum); |
1586 | ubi_dbg_dump_seb(seb, 0); | 1586 | ubi_dbg_dump_seb(seb, 0); |
1587 | ubi_dbg_dump_sv(sv); | 1587 | ubi_dump_sv(sv); |
1588 | goto out; | 1588 | goto out; |
1589 | 1589 | ||
1590 | bad_sv: | 1590 | bad_sv: |
1591 | ubi_err("bad scanning information about volume %d", sv->vol_id); | 1591 | ubi_err("bad scanning information about volume %d", sv->vol_id); |
1592 | ubi_dbg_dump_sv(sv); | 1592 | ubi_dump_sv(sv); |
1593 | goto out; | 1593 | goto out; |
1594 | 1594 | ||
1595 | bad_vid_hdr: | 1595 | bad_vid_hdr: |
1596 | ubi_err("bad scanning information about volume %d", sv->vol_id); | 1596 | ubi_err("bad scanning information about volume %d", sv->vol_id); |
1597 | ubi_dbg_dump_sv(sv); | 1597 | ubi_dump_sv(sv); |
1598 | ubi_dump_vid_hdr(vidh); | 1598 | ubi_dump_vid_hdr(vidh); |
1599 | 1599 | ||
1600 | out: | 1600 | out: |
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index 897502fba301..b37872cc5218 100644 --- 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, | |||
700 | 700 | ||
701 | bad: | 701 | bad: |
702 | ubi_err("bad scanning information, error %d", err); | 702 | ubi_err("bad scanning information, error %d", err); |
703 | ubi_dbg_dump_sv(sv); | 703 | ubi_dump_sv(sv); |
704 | ubi_dump_vol_info(vol); | 704 | ubi_dump_vol_info(vol); |
705 | return -EINVAL; | 705 | return -EINVAL; |
706 | } | 706 | } |