From: Dan Carpenter <dan.carpenter@oracle.com>
To: "David S. Miller" <davem@davemloft.net>,
Yunsheng Lin <linyunsheng@huawei.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>,
Wenwen Wang <wang6495@umn.edu>,
Boris Pismenny <borisp@mellanox.com>,
Ilya Lesokhin <ilyal@mellanox.com>,
Edward Cree <ecree@solarflare.com>,
Michal Kubecek <mkubecek@suse.cz>,
Yury Norov <ynorov@caviumnetworks.com>,
Jakub Kicinski <jakub.kicinski@netronome.com>,
netdev@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH net] ethtool: remove unnecessary check in ethtool_get_regs()
Date: Fri, 01 Feb 2019 08:24:06 +0000 [thread overview]
Message-ID: <20190201082406.GA8459@kadam> (raw)
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
next reply other threads:[~2019-02-01 8:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-01 8:24 Dan Carpenter [this message]
2019-02-01 17:59 ` [PATCH net] ethtool: remove unnecessary check in ethtool_get_regs() David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190201082406.GA8459@kadam \
--to=dan.carpenter@oracle.com \
--cc=borisp@mellanox.com \
--cc=davem@davemloft.net \
--cc=ecree@solarflare.com \
--cc=f.fainelli@gmail.com \
--cc=ilyal@mellanox.com \
--cc=jakub.kicinski@netronome.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linyunsheng@huawei.com \
--cc=mkubecek@suse.cz \
--cc=netdev@vger.kernel.org \
--cc=wang6495@umn.edu \
--cc=ynorov@caviumnetworks.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox