2020-11-08 06:43:47

by Kaixu Xia

Subject: [PATCH] s390/qeth: remove useless if/else

From: Kaixu Xia <[email protected]>

Fix the following coccinelle report:

./drivers/s390/net/qeth_l3_main.c:107:2-4: WARNING: possible condition with no effect (if == else)

Both branches are the same, so remove them.

Reported-by: Tosk Robot <[email protected]>
Signed-off-by: Kaixu Xia <[email protected]>
---
drivers/s390/net/qeth_l3_main.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index b1c1d2510d55..264b6c782382 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -104,10 +104,7 @@ static bool qeth_l3_is_addr_covered_by_ipato(struct qeth_card *card,
qeth_l3_convert_addr_to_bits(ipatoe->addr, ipatoe_bits,
(ipatoe->proto == QETH_PROT_IPV4) ?
4 : 16);
- if (addr->proto == QETH_PROT_IPV4)
- rc = !memcmp(addr_bits, ipatoe_bits, ipatoe->mask_bits);
- else
- rc = !memcmp(addr_bits, ipatoe_bits, ipatoe->mask_bits);
+ rc = !memcmp(addr_bits, ipatoe_bits, ipatoe->mask_bits);
if (rc)
break;
}
--
2.20.0

2020-11-08 21:00:49

by Joe Perches

Subject: Re: [PATCH] s390/qeth: remove useless if/else

On Sun, 2020-11-08 at 14:34 +0800, [email protected] wrote:
> From: Kaixu Xia <[email protected]>
>
> Fix the following coccinelle report:
>
> ./drivers/s390/net/qeth_l3_main.c:107:2-4: WARNING: possible condition with no effect (if == else)
>
> Both branches are the same, so remove them.
[]
> diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
[]
> @@ -104,10 +104,7 @@ static bool qeth_l3_is_addr_covered_by_ipato(struct qeth_card *card,
> ? qeth_l3_convert_addr_to_bits(ipatoe->addr, ipatoe_bits,
> ? (ipatoe->proto == QETH_PROT_IPV4) ?
> ? 4 : 16);
> - if (addr->proto == QETH_PROT_IPV4)
> - rc = !memcmp(addr_bits, ipatoe_bits, ipatoe->mask_bits);
> - else
> - rc = !memcmp(addr_bits, ipatoe_bits, ipatoe->mask_bits);
> + rc = !memcmp(addr_bits, ipatoe_bits, ipatoe->mask_bits);

It's not always best to remove one branch.

Is this a copy/paste defect or is it useless?
Do you know which?
If you do, you should state this in the commit message.

2020-11-09 08:09:30

by Julian Wiedmann

Subject: Re: [PATCH] s390/qeth: remove useless if/else

On 08.11.20 08:34, [email protected] wrote:
> From: Kaixu Xia <[email protected]>
>
> Fix the following coccinelle report:
>
> ./drivers/s390/net/qeth_l3_main.c:107:2-4: WARNING: possible condition with no effect (if == else)
>
> Both branches are the same, so remove them.
>

Indeed, missed that in commit
ab29c480b194 ("s390/qeth: replace deprecated simple_stroul()")

Applied, thanks!

> Reported-by: Tosk Robot <[email protected]>
> Signed-off-by: Kaixu Xia <[email protected]>
> ---
> drivers/s390/net/qeth_l3_main.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
> index b1c1d2510d55..264b6c782382 100644
> --- a/drivers/s390/net/qeth_l3_main.c
> +++ b/drivers/s390/net/qeth_l3_main.c
> @@ -104,10 +104,7 @@ static bool qeth_l3_is_addr_covered_by_ipato(struct qeth_card *card,
> qeth_l3_convert_addr_to_bits(ipatoe->addr, ipatoe_bits,
> (ipatoe->proto == QETH_PROT_IPV4) ?
> 4 : 16);
> - if (addr->proto == QETH_PROT_IPV4)
> - rc = !memcmp(addr_bits, ipatoe_bits, ipatoe->mask_bits);
> - else
> - rc = !memcmp(addr_bits, ipatoe_bits, ipatoe->mask_bits);
> + rc = !memcmp(addr_bits, ipatoe_bits, ipatoe->mask_bits);
> if (rc)
> break;
> }
>