Re: [U-Boot] [PATCH 1/1] arm64: zynqmp: remove unnecessary logical constraint

2017-10-13 Thread Michal Simek
On 13.10.2017 01:14, Heinrich Schuchardt wrote:
> 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 
> ---
>  arch/arm/cpu/armv8/zynqmp/cpu.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/cpu/armv8/zynqmp/cpu.c
> index 1b5066a826..9b83e51885 100644
> --- a/arch/arm/cpu/armv8/zynqmp/cpu.c
> +++ b/arch/arm/cpu/armv8/zynqmp/cpu.c
> @@ -198,7 +198,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);
>  
> @@ -215,7 +215,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];
> 

Applied.

Thanks,
Michal
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot


[U-Boot] [PATCH 1/1] arm64: zynqmp: remove unnecessary logical constraint

2017-10-12 Thread Heinrich Schuchardt
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 
---
 arch/arm/cpu/armv8/zynqmp/cpu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/cpu/armv8/zynqmp/cpu.c
index 1b5066a826..9b83e51885 100644
--- a/arch/arm/cpu/armv8/zynqmp/cpu.c
+++ b/arch/arm/cpu/armv8/zynqmp/cpu.c
@@ -198,7 +198,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);
 
@@ -215,7 +215,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];
-- 
2.14.1

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot