usbnet: ipheth: Remove unnecessary NULL pointer check
authorGuenter Roeck <linux@roeck-us.net>
Wed, 1 May 2019 00:35:33 +0000 (17:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 4 May 2019 03:59:31 +0000 (23:59 -0400)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/ipheth.c

index a01a71a7e48d6047c46970799cd8837277e1e586..c247aed2dcebbe8025a8c9595c530c03a9240712 100644 (file)
@@ -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;