From: Vladimir Oltean Date: Sun, 2 Apr 2023 12:37:50 +0000 (+0300) Subject: net: simplify handling of dsa_ndo_eth_ioctl() return code X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1193db2a55b6b04f296f03affdfa80c16ecc3814;p=linux.git net: simplify handling of dsa_ndo_eth_ioctl() return code In the expression "x == 0 || x != -95", the term "x == 0" does not change the expression's logical value, because 0 != -95, and so, if x is 0, the expression would still be true by virtue of the second term. If x is non-zero, the expression depends on the truth value of the second term anyway. As such, the first term is redundant and can be deleted. Signed-off-by: Vladimir Oltean Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller --- diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c index 1c0256ea522f9..b299fb23fcfaa 100644 --- a/net/core/dev_ioctl.c +++ b/net/core/dev_ioctl.c @@ -249,7 +249,7 @@ static int dev_eth_ioctl(struct net_device *dev, int err; err = dsa_ndo_eth_ioctl(dev, ifr, cmd); - if (err == 0 || err != -EOPNOTSUPP) + if (err != -EOPNOTSUPP) return err; if (ops->ndo_eth_ioctl) {