2022-06-26 10:45:51

by Praghadeesh T K S

Subject: [PATCH] net: ethernet/nvidia: fix possible condition with no effect

Fix Coccinelle bug, removed condition with no effect.

Signed-off-by: Praghadeesh T K S <[email protected]>
---
drivers/net/ethernet/nvidia/forcedeth.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index 5116bad..8e49cfa 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -3471,9 +3471,6 @@ static int nv_update_linkspeed(struct net_device *dev)
} else if (adv_lpa & LPA_10FULL) {
newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
newdup = 1;
- } else if (adv_lpa & LPA_10HALF) {
- newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
- newdup = 0;
} else {
newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
newdup = 0;
--
2.34.1

2022-06-26 11:11:24

by Andrew Lunn

Subject: Re: [PATCH] net: ethernet/nvidia: fix possible condition with no effect

On Sun, Jun 26, 2022 at 10:35:39AM +0000, Praghadeesh T K S wrote:
> Fix Coccinelle bug, removed condition with no effect.

This is not a coccinelle bug. If it was, you would be patching
coccinelle, not the kernel.

> Signed-off-by: Praghadeesh T K S <[email protected]>
> ---
> drivers/net/ethernet/nvidia/forcedeth.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
> index 5116bad..8e49cfa 100644
> --- a/drivers/net/ethernet/nvidia/forcedeth.c
> +++ b/drivers/net/ethernet/nvidia/forcedeth.c
> @@ -3471,9 +3471,6 @@ static int nv_update_linkspeed(struct net_device *dev)
> } else if (adv_lpa & LPA_10FULL) {
> newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
> newdup = 1;
> - } else if (adv_lpa & LPA_10HALF) {
> - newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
> - newdup = 0;
> } else {
> newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
> newdup = 0;

Please google this, see the past discussion about why this code is
there.

Andrew

2022-06-27 18:41:51

by Jakub Kicinski

Subject: Re: [PATCH] net: ethernet/nvidia: fix possible condition with no effect

On Sun, 26 Jun 2022 13:08:37 +0200 Andrew Lunn wrote:
> On Sun, Jun 26, 2022 at 10:35:39AM +0000, Praghadeesh T K S wrote:
> > Fix Coccinelle bug, removed condition with no effect.
>
> This is not a coccinelle bug. If it was, you would be patching
> coccinelle, not the kernel.

I'd say the commit message is better than the commit ;)
Praghadeesh, could you fix Coccinelle to avoid matching:

if (/* case 1 */) {
/* BLOCK 1*/
} else (/* case 2 */ {
/* BLOCK 2 */
} else {
/* default == BLOCK 2 */
}

Because 99% of the time that construct is intentional.