ethtool: remove unnecessary check in ethtool_get_regs()
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 1 Feb 2019 08:24:06 +0000 (11:24 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 Feb 2019 17:58:07 +0000 (09:58 -0800)
We recently changed this function in commit f9fc54d313fa ("ethtool:
check the return value of get_regs_len") such that if "reglen" is zero
we return directly.  That means we can remove this condition as well.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/ethtool.c

index 158264f7cfafbe8d857a2781204979de3b8958aa..3fe6e9da357983ba8508b01bff33360f2115ee69 100644 (file)
@@ -1348,12 +1348,9 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)
        if (regs.len > reglen)
                regs.len = reglen;
 
-       regbuf = NULL;
-       if (reglen) {
-               regbuf = vzalloc(reglen);
-               if (!regbuf)
-                       return -ENOMEM;
-       }
+       regbuf = vzalloc(reglen);
+       if (!regbuf)
+               return -ENOMEM;
 
        ops->get_regs(dev, &regs, regbuf);