* [PATCH net] ethtool: remove unnecessary check in ethtool_get_regs()
@ 2019-02-01 8:24 Dan Carpenter
2019-02-01 17:59 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2019-02-01 8:24 UTC (permalink / raw)
To: David S. Miller, Yunsheng Lin
Cc: Florian Fainelli, Wenwen Wang, Boris Pismenny, Ilya Lesokhin,
Edward Cree, Michal Kubecek, Yury Norov, Jakub Kicinski, netdev,
kernel-janitors
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>
---
net/core/ethtool.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 158264f7cfaf..3fe6e9da3579 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -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, ®s, regbuf);
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH net] ethtool: remove unnecessary check in ethtool_get_regs()
2019-02-01 8:24 [PATCH net] ethtool: remove unnecessary check in ethtool_get_regs() Dan Carpenter
@ 2019-02-01 17:59 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-02-01 17:59 UTC (permalink / raw)
To: dan.carpenter
Cc: linyunsheng, f.fainelli, wang6495, borisp, ilyal, ecree, mkubecek,
ynorov, jakub.kicinski, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 1 Feb 2019 11:24:06 +0300
> 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>
Applied to net-next, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-01 17:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-01 8:24 [PATCH net] ethtool: remove unnecessary check in ethtool_get_regs() Dan Carpenter
2019-02-01 17:59 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox