2020-06-24 00:59:29

by Gaurav Singh

Subject: [PATCH] [net/ethernet] do_reset: remove dev null check

dev cannot be NULL here since its already being accessed
before. Remove the redundant null check.

Signed-off-by: Gaurav Singh <[email protected]>
---
drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c
index 480ab7251515..3e3883ad88b0 100644
--- a/drivers/net/ethernet/xircom/xirc2ps_cs.c
+++ b/drivers/net/ethernet/xircom/xirc2ps_cs.c
@@ -1473,7 +1473,7 @@ do_reset(struct net_device *dev, int full)
unsigned int ioaddr = dev->base_addr;
unsigned value;

- pr_debug("%s: do_reset(%p,%d)\n", dev? dev->name:"eth?", dev, full);
+ pr_debug("%s: do_reset(%p,%d)\n", dev->name, dev, full);

hardreset(dev);
PutByte(XIRCREG_CR, SoftReset); /* set */
--
2.17.1

2020-06-24 03:19:33

by David Miller

Subject: Re: [PATCH] [net/ethernet] do_reset: remove dev null check

From: Gaurav Singh <[email protected]>
Date: Tue, 23 Jun 2020 20:55:45 -0400

> dev cannot be NULL here since its already being accessed
> before. Remove the redundant null check.
>
> Signed-off-by: Gaurav Singh <[email protected]>

I changed your Subject to be:

[PATCH net-next] xirc2ps_cs: remove dev null check from do_reset().

Since that is more properly formed.

Applied to net-next, thanks.