s390/qeth: remove gratuitous NULL checks (5bcd8ad9) · Commits · 戴 / test

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -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);

drivers/s390/net/qeth_l2_main.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message