arm64: zynqmp: remove unnecessary logical constraint

In

if (a || b)
else if (!a)

the constraint (!a) is always true if else is reached and
can be removed.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/cpu/armv8/zynqmp/cpu.c
index dc10dba2bcf32175895b9d7d1c5c2ca796760a3b..f026cb4511f02f738cc28561ac38b0fc16ff554c 100644 (file)
--- a/arch/arm/cpu/armv8/zynqmp/cpu.c
+++ b/arch/arm/cpu/armv8/zynqmp/cpu.c
@@ -210,7 +210,7 @@ int zynqmp_mmio_write(const u32 address,
 {
        if (IS_ENABLED(CONFIG_SPL_BUILD) || current_el() == 3)
                return zynqmp_mmio_rawwrite(address, mask, value);
-       else if (!IS_ENABLED(CONFIG_SPL_BUILD))
+       else
                return invoke_smc(ZYNQMP_MMIO_WRITE, address, mask,
                                  value, 0, NULL);
 
@@ -227,7 +227,7 @@ int zynqmp_mmio_read(const u32 address, u32 *value)
 
        if (IS_ENABLED(CONFIG_SPL_BUILD) || current_el() == 3) {
                ret = zynqmp_mmio_rawread(address, value);
-       } else if (!IS_ENABLED(CONFIG_SPL_BUILD)) {
+       } else {
                ret = invoke_smc(ZYNQMP_MMIO_READ, address, 0, 0,
                                 0, ret_payload);
                *value = ret_payload[1];