diff mbox series

[for,3.0] sm501: Fix warning about unreachable code

Message ID 20180715211731.311B67456B5@zero.eik.bme.hu
State New
Headers show
Series [for,3.0] sm501: Fix warning about unreachable code | expand

Commit Message

BALATON Zoltan July 15, 2018, 8:59 p.m. UTC
Coverity warned that the false arm of conditional expression is
unreachable when it is inside an if with the same condition.
Remove the unreachable code to avoid the warning.

Fixes: CID 1394215
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
 hw/display/sm501.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Philippe Mathieu-Daudé July 15, 2018, 10:19 p.m. UTC | #1
On 07/15/2018 05:59 PM, BALATON Zoltan wrote:
> Coverity warned that the false arm of conditional expression is
> unreachable when it is inside an if with the same condition.
> Remove the unreachable code to avoid the warning.
> 
> Fixes: CID 1394215
> Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  hw/display/sm501.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/display/sm501.c b/hw/display/sm501.c
> index 9ab29d3..874260a 100644
> --- a/hw/display/sm501.c
> +++ b/hw/display/sm501.c
> @@ -1024,7 +1024,7 @@ static void sm501_i2c_write(void *opaque, hwaddr addr, uint64_t value,
>                          if (res) {
>                              SM501_DPRINTF("sm501 i2c : transfer failed"
>                                            " i=%d, res=%d\n", i, res);
> -                            s->i2c_status |= (res ? SM501_I2C_STATUS_ERROR : 0);
> +                            s->i2c_status |= SM501_I2C_STATUS_ERROR;
>                              return;
>                          }
>                      }
>
David Gibson July 16, 2018, 1:19 a.m. UTC | #2
On Sun, Jul 15, 2018 at 10:59:21PM +0200, BALATON Zoltan wrote:
> Coverity warned that the false arm of conditional expression is
> unreachable when it is inside an if with the same condition.
> Remove the unreachable code to avoid the warning.
> 
> Fixes: CID 1394215
> Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>

Applied to ppc-for-3.0, thanks.

> ---
>  hw/display/sm501.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/display/sm501.c b/hw/display/sm501.c
> index 9ab29d3..874260a 100644
> --- a/hw/display/sm501.c
> +++ b/hw/display/sm501.c
> @@ -1024,7 +1024,7 @@ static void sm501_i2c_write(void *opaque, hwaddr addr, uint64_t value,
>                          if (res) {
>                              SM501_DPRINTF("sm501 i2c : transfer failed"
>                                            " i=%d, res=%d\n", i, res);
> -                            s->i2c_status |= (res ? SM501_I2C_STATUS_ERROR : 0);
> +                            s->i2c_status |= SM501_I2C_STATUS_ERROR;
>                              return;
>                          }
>                      }
diff mbox series

Patch

diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 9ab29d3..874260a 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -1024,7 +1024,7 @@  static void sm501_i2c_write(void *opaque, hwaddr addr, uint64_t value,
                         if (res) {
                             SM501_DPRINTF("sm501 i2c : transfer failed"
                                           " i=%d, res=%d\n", i, res);
-                            s->i2c_status |= (res ? SM501_I2C_STATUS_ERROR : 0);
+                            s->i2c_status |= SM501_I2C_STATUS_ERROR;
                             return;
                         }
                     }