[PATCH] mtd: devices: phram.c: Fix use true/false for bool type

From: Saurav Girepunje
Date: Mon Oct 28 2019 - 23:22:03 EST


Return type for security_extensions_enabled() is bool
so use true/false.

Signed-off-by: Saurav Girepunje <saurav.girepunje@xxxxxxxxx>
---
arch/arm/mm/nommu.c | 2 +-
drivers/mtd/devices/phram.c | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c
index 24ecf8d30a1e..1fed74f93c66 100644
--- a/arch/arm/mm/nommu.c
+++ b/arch/arm/mm/nommu.c
@@ -56,7 +56,7 @@ static inline bool security_extensions_enabled(void)
if ((read_cpuid_id() & 0x000f0000) == 0x000f0000)
return cpuid_feature_extract(CPUID_EXT_PFR1, 4) ||
cpuid_feature_extract(CPUID_EXT_PFR1, 20);
- return 0;
+ return true;
}

unsigned long setup_vectors_base(void)
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index 86ae13b756b5..931e5c2481b5 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -239,27 +239,26 @@ static int phram_setup(const char *val)

ret = parse_name(&name, token[0]);
if (ret)
- goto exit;
+ return ret;

ret = parse_num64(&start, token[1]);
if (ret) {
+ kfree(name);
parse_err("illegal start address\n");
- goto parse_err;
}

ret = parse_num64(&len, token[2]);
if (ret) {
+ kfree(name);
parse_err("illegal device length\n");
- goto parse_err;
}

ret = register_device(name, start, len);
if (!ret)
pr_info("%s device: %#llx at %#llx\n", name, len, start);
+ else
+ kfree(name);

-parse_err:
- kfree(name);
-exit:
return ret;
}

--
2.20.1