From patchwork Fri Feb 1 08:24:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 1034621 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="mt79Kva9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rVWx17rtz9s4V for ; Fri, 1 Feb 2019 19:24:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728889AbfBAIYn (ORCPT ); Fri, 1 Feb 2019 03:24:43 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:33464 "EHLO aserp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726110AbfBAIYm (ORCPT ); Fri, 1 Feb 2019 03:24:42 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x118Nu49008579; Fri, 1 Feb 2019 08:24:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : mime-version : content-type; s=corp-2018-07-02; bh=/LVt6pMej7mTEwRvexQai9XGIXUW1Rem+1uvbgIF4gk=; b=mt79Kva9YFDvNeIrR8/I1J8Sp7l3LyxMWbhD5UR59q5/Ud5drDC8CvZjjhlJnZdN58ug om/PbjgjSeV7RCtH/8z52/tYVYfW5107IhBGqx8B8H4EQ1yJk+Pg+v4Ccbo5Uf24dO5Z c1PX6pqQs8wnoT3Tphsiph4ohL2sGKgdlAfsOoyV7oIN5IRWGaMjAGzoNh3tLQQxnTGQ b3ldryjBL8Nxs6XO3TUVlq65K++JJ+cHD6yiyGdxxU5bQtcthjXEP26uqIPfnSNs91xy sgHpuVAFHX/lXduxhBphPpph+kccuNQnS4/uYHBPYXFesMiEfGbnlygbQWd617Vk9IkO wQ== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp2130.oracle.com with ESMTP id 2q8d2enbdg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 01 Feb 2019 08:24:22 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id x118OLHY000414 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 1 Feb 2019 08:24:21 GMT Received: from abhmp0011.oracle.com (abhmp0011.oracle.com [141.146.116.17]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x118OK9J005628; Fri, 1 Feb 2019 08:24:20 GMT Received: from kadam (/197.157.0.29) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 01 Feb 2019 00:24:19 -0800 Date: Fri, 1 Feb 2019 11:24:06 +0300 From: Dan Carpenter To: "David S. Miller" , Yunsheng Lin Cc: Florian Fainelli , Wenwen Wang , Boris Pismenny , Ilya Lesokhin , Edward Cree , Michal Kubecek , Yury Norov , Jakub Kicinski , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH net] ethtool: remove unnecessary check in ethtool_get_regs() Message-ID: <20190201082406.GA8459@kadam> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9153 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1902010063 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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);