s390/qeth: remove gratuitous NULL checks
authorJulian Wiedmann <jwi@linux.ibm.com>
Wed, 18 Mar 2020 12:54:54 +0000 (13:54 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Mar 2020 23:33:35 +0000 (16:33 -0700)
qeth_do_ioctl() is only reached through our own net_device_ops, so we
can trust that dev->ml_priv still contains what we put there earlier.

qeth_bridgeport_an_set() is an internal function that doesn't require
such sanity checks.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/s390/net/qeth_core_main.c
drivers/s390/net/qeth_l2_main.c

index 3f0b13f..bd3adbb 100644 (file)
@@ -6264,9 +6264,6 @@ int qeth_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
        struct mii_ioctl_data *mii_data;
        int rc = 0;
 
-       if (!card)
-               return -ENODEV;
-
        switch (cmd) {
        case SIOC_QETH_ADP_SET_SNMP_CONTROL:
                rc = qeth_snmp_command(card, rq->ifr_ifru.ifru_data);
index 71eb2d9..2aaf5e3 100644 (file)
@@ -1519,8 +1519,6 @@ int qeth_bridgeport_an_set(struct qeth_card *card, int enable)
        struct ccw_device *ddev;
        struct subchannel_id schid;
 
-       if (!card)
-               return -EINVAL;
        if (!card->options.sbp.supported_funcs)
                return -EOPNOTSUPP;
        ddev = CARD_DDEV(card);