From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Thu, 15 Aug 2013 13:55:06 +0000 (+0900)
Subject: mtd: pagetest: remove always true condition
X-Git-Tag: next-20130822~69^2~30
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6aef1fee6e857e88e97fee4f4e1470fb8c23d9f9;p=karo-tx-linux.git

mtd: pagetest: remove always true condition

Remove useless checks just after checking 'err' is not zero.  These
checks should have been removed when converting to use mtdtest_read().

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
---

diff --git a/drivers/mtd/tests/pagetest.c b/drivers/mtd/tests/pagetest.c
index 22cc38c32a19..83189765eb05 100644
--- a/drivers/mtd/tests/pagetest.c
+++ b/drivers/mtd/tests/pagetest.c
@@ -272,7 +272,7 @@ static int erasecrosstest(void)
 	if (err) {
 		pr_err("error: read failed at %#llx\n",
 		       (long long)addr0);
-		return err ? err : -1;
+		return err;
 	}
 
 	pr_info("verifying 1st page of block %d\n", ebnum);
@@ -308,7 +308,7 @@ static int erasecrosstest(void)
 	if (err) {
 		pr_err("error: read failed at %#llx\n",
 		       (long long)addr0);
-		return err ? err : -1;
+		return err;
 	}
 
 	pr_info("verifying 1st page of block %d\n", ebnum);
@@ -361,7 +361,7 @@ static int erasetest(void)
 	if (err) {
 		pr_err("error: read failed at %#llx\n",
 		       (long long)addr0);
-		return err ? err : -1;
+		return err;
 	}
 
 	pr_info("verifying 1st page of block %d is all 0xff\n",