Skip to contentSkip to conversation

sm501: Fix warning about unreachable code

PATCH Applied BALATON Zoltan 3 participants 3 messages Jul 15, 2018 – Jul 16, 2018

lore
Share & tools
lore

BALATON Zoltan

author
#0 lore raw

PATCH 1/1 sm501: Fix warning about unreachable code

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 <[email protected]>
Signed-off-by BALATON Zoltan <[email protected]>
---
 hw/display/sm501.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/display/sm501.c +1 -1
index 9ab29d3..874260a 100644
@@ -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;
                         }
                     }
Signature · 1 line
2.7.6
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · BALATON Zoltan

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 <[email protected]>
Signed-off-by BALATON Zoltan <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Quoted 18 lines
---
 hw/display/sm501.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/display/sm501.c +1 -1
index 9ab29d3..874260a 100644
@@ -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;
                         }
                     }
Applied
#2 lore raw
In reply to BALATON Zoltan
Quoted 7 lines · BALATON Zoltan

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 <[email protected]>
Signed-off-by BALATON Zoltan <[email protected]>

Applied to ppc-for-3.0, thanks.

Quoted 17 lines
---
 hw/display/sm501.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/display/sm501.c +1 -1
index 9ab29d3..874260a 100644
@@ -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;
                         }
                     }
Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson