diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2010-01-20 10:28:58 +0200 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2010-02-01 15:16:37 +0200 |
| commit | adbf05e3ec6ea380ba145b6fa89d9125ed76eb98 (patch) | |
| tree | 9da867755d3b915ec1a759658397aaa31bc68263 /drivers/mtd/ubi/scan.c | |
| parent | 0bf1c4399afee6a2031b0ee943a4c016e53f727c (diff) | |
| download | kernel_samsung_smdk4412-adbf05e3ec6ea380ba145b6fa89d9125ed76eb98.zip kernel_samsung_smdk4412-adbf05e3ec6ea380ba145b6fa89d9125ed76eb98.tar.gz kernel_samsung_smdk4412-adbf05e3ec6ea380ba145b6fa89d9125ed76eb98.tar.bz2 | |
UBI: simplify debugging return codes
UBI debugging functions were a little bit over-engineered and
returned more error codes than needed, and the callers had to
do useless checks. Simplify the return codes.
Impact: only debugging code is affected, which means that for
non-developers this is a no-op patch.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd/ubi/scan.c')
| -rw-r--r-- | drivers/mtd/ubi/scan.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c index 90af61a..594184b 100644 --- a/drivers/mtd/ubi/scan.c +++ b/drivers/mtd/ubi/scan.c @@ -974,11 +974,8 @@ struct ubi_scan_info *ubi_scan(struct ubi_device *ubi) seb->ec = si->mean_ec; err = paranoid_check_si(ubi, si); - if (err) { - if (err > 0) - err = -EINVAL; + if (err) goto out_vidh; - } ubi_free_vid_hdr(ubi, vidh); kfree(ech); @@ -1086,8 +1083,8 @@ void ubi_scan_destroy_si(struct ubi_scan_info *si) * @ubi: UBI device description object * @si: scanning information * - * This function returns zero if the scanning information is all right, %1 if - * not and a negative error code if an error occurred. + * This function returns zero if the scanning information is all right, and a + * negative error code if not or if an error occurred. */ static int paranoid_check_si(struct ubi_device *ubi, struct ubi_scan_info *si) { @@ -1346,7 +1343,7 @@ bad_vid_hdr: out: ubi_dbg_dump_stack(); - return 1; + return -EINVAL; } #endif /* CONFIG_MTD_UBI_DEBUG_PARANOID */ |