| Message ID | 1556670933-755-1-git-send-email-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | e28441e2ea090a4751160a75e5b0d823116a92fb |
| Headers | show |
| Series | usbnet: ipheth: Remove unnecessary NULL pointer check | expand |
From: Guenter Roeck <linux@roeck-us.net> Date: Tue, 30 Apr 2019 17:35:33 -0700 > ipheth_carrier_set() is called from two locations. In > ipheth_carrier_check_work(), its parameter 'dev' is set with > container_of(work, ...) and can not be NULL. In ipheth_open(), > dev is extracted from netdev_priv(net) and dereferenced before > the call to ipheth_carrier_set(). The NULL pointer check of dev > in ipheth_carrier_set() is therefore unnecessary and can be removed. > > Cc: Gustavo A. R. Silva <garsilva@embeddedor.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> Applied to net-next.
diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c index a01a71a7e48d..c247aed2dceb 100644 --- a/drivers/net/usb/ipheth.c +++ b/drivers/net/usb/ipheth.c @@ -241,8 +241,6 @@ static int ipheth_carrier_set(struct ipheth_device *dev) struct usb_device *udev; int retval; - if (!dev) - return 0; if (!dev->confirmed_pairing) return 0;
ipheth_carrier_set() is called from two locations. In ipheth_carrier_check_work(), its parameter 'dev' is set with container_of(work, ...) and can not be NULL. In ipheth_open(), dev is extracted from netdev_priv(net) and dereferenced before the call to ipheth_carrier_set(). The NULL pointer check of dev in ipheth_carrier_set() is therefore unnecessary and can be removed. Cc: Gustavo A. R. Silva <garsilva@embeddedor.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- drivers/net/usb/ipheth.c | 2 -- 1 file changed, 2 deletions(-)