Skip to contentSkip to conversation

ethtool: remove unnecessary check in ethtool_get_regs()

PATCH Applied Dan Carpenter 2 participants 2 messages Feb 1, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ethtool: remove unnecessary check in ethtool_get_regs()

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.

---
 net/core/ethtool.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
net/core/ethtool.c +3 -6
index 158264f7cfaf..3fe6e9da3579 100644
@@ -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);
 
Signature · 1 line
2.17.1
maintainer Applied
#1 lore raw

From: Dan Carpenter <[email protected]>
Date: Fri, 1 Feb 2019 11:24:06 +0300

Quoted 5 lines

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.

Applied to net-next, thanks.