Received: by 10.223.185.111 with SMTP id b44csp1654928wrg; Sat, 10 Mar 2018 10:43:30 -0800 (PST) X-Google-Smtp-Source: AG47ELuVzhfjozIceTiGhKuIXbEX9FYgrg3/TZhrD2YNjRqq5klyRIOWIsaTIgGY/gEVcTdHBds5 X-Received: by 10.98.70.89 with SMTP id t86mr2696035pfa.215.1520707410777; Sat, 10 Mar 2018 10:43:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520707410; cv=none; d=google.com; s=arc-20160816; b=b9NwtjTjV3mIB22bsQNKNCplQrIOYfwOE2Xkpk7Gnjc8CeMCB0fy6fHqAW27RgAAVY y0Tx4IxtmPF+lVPjE/JuhGfOYtUoh6kqhvtJXmj95J76jb6sw80uRdySqWLEojHu5MSz rQWXPZFDg2azuvbCf+7ReDG7Ux/89Basdm/GJKIdtK0bqwgnVre2QP94RmW2dQGV9ZuR 8G1gSXizhqCHgeiZwNFGaURhCwKw/kP0kSxoCM667Cc7bJfbzyartOU+0vWQ3SZDx66G i2enE6OV2WRSHBvrWLnZswR5+KU7pluJgIVAdJ1/h/EB4i3N6TALJTIXM+zBV3FmadjM yhBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:date:cc:to:from:subject:message-id :arc-authentication-results; bh=8JVQMqt63dlLdTCWkFaYkK5QFq/FvXCxw9y7RH/7KjU=; b=CBlg5w7/eJFT4t4FplQxHsvEZd8Tao3nkQVKxpRmfwsKbiAHar+Gk6NLG5Ix6PXaEX UibFpnQ/66JNVQS/v+7cjspemhnMGWeRi3+ktXjO9VuZ17V2eWJBb/ia6q73MkZPs/H9 BayfifEVHDYVC++BhgRBbsFRWuVq4bOXWKodh+uHhBghlUjjBpz+MNdhmlcAOfPJt2jD SyCa+7P0MqGR6VPHdVQ5BrYAFbs+ZJnooIH+yyJWqTSokOOauRpAKZydVDfMi6D1wMY/ cLKq0vFK+LpbKvmAFrudE8FrzuiEvgce9X1m+kWUg3iUAfrdsDQssCjQ66bMwt/FxAZB +JuQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i2si716130pgc.818.2018.03.10.10.43.15; Sat, 10 Mar 2018 10:43:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932440AbeCJSmG (ORCPT + 99 others); Sat, 10 Mar 2018 13:42:06 -0500 Received: from smtprelay0148.hostedemail.com ([216.40.44.148]:38484 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932324AbeCJSmC (ORCPT ); Sat, 10 Mar 2018 13:42:02 -0500 Received: from smtprelay.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by smtpgrave03.hostedemail.com (Postfix) with ESMTP id CC97B1801D3C7; Sat, 10 Mar 2018 18:42:01 +0000 (UTC) Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay04.hostedemail.com (Postfix) with ESMTP id 7573A180A814E; Sat, 10 Mar 2018 18:42:00 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::::::::::::,RULES_HIT:41:69:355:379:541:599:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1542:1593:1594:1711:1730:1747:1777:1792:2198:2199:2393:2553:2559:2562:2828:3138:3139:3140:3141:3142:3354:3622:3865:3866:3867:3868:3872:3874:4321:4605:5007:6119:7576:7903:10004:10400:10848:10967:11026:11232:11473:11658:11914:12043:12048:12294:12296:12438:12555:12683:12740:12760:12895:13439:14096:14097:14181:14659:14721:21080:21324:21451:21627:30012:30054:30090:30091,0,RBL:47.151.150.235:@perches.com:.lbl8.mailshell.net-62.14.0.100 64.201.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:20,LUA_SUMMARY:none X-HE-Tag: walk34_2e65402bbd83b X-Filterd-Recvd-Size: 3627 Received: from XPS-9350 (unknown [47.151.150.235]) (Authenticated sender: joe@perches.com) by omf10.hostedemail.com (Postfix) with ESMTPA; Sat, 10 Mar 2018 18:41:58 +0000 (UTC) Message-ID: <1520707317.5345.15.camel@perches.com> Subject: Re: [PATCH 1/2] net/usb/ax88179_178a: Use common code in ax88179_chk_eee() From: Joe Perches To: SF Markus Elfring , linux-usb@vger.kernel.org, netdev@vger.kernel.org, "Andrew F. Davis" , =?ISO-8859-1?Q?Bj=F8rn?= Mork , "David S. Miller" , Philippe Reynes , Yuval Shaia Cc: LKML , kernel-janitors@vger.kernel.org Date: Sat, 10 Mar 2018 10:41:57 -0800 In-Reply-To: References: Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.26.1-1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, 2018-03-10 at 19:24 +0100, SF Markus Elfring wrote: > From: Markus Elfring > Date: Sat, 10 Mar 2018 18:22:43 +0100 > > Adjust a jump target so that a bit of common code can be better reused > at the end of this function. Please stop mindlessly sending patching Markus. How about looking at the code being modified and thinking about what it does? Try unindenting the block by reversing the first test and using the same goto set_inactive. Look at the last & tests + if (!(lp & adv & supported)) and see if it should use && or be more simple to read by using if (!condition || ! > --- > drivers/net/usb/ax88179_178a.c | 34 +++++++++++----------------------- > 1 file changed, 11 insertions(+), 23 deletions(-) > > diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c > index f32261ecd215..e4b0baa98e9a 100644 > --- a/drivers/net/usb/ax88179_178a.c > +++ b/drivers/net/usb/ax88179_178a.c > @@ -689,49 +689,37 @@ static int ax88179_chk_eee(struct usbnet *dev) > eee_cap = ax88179_phy_read_mmd_indirect(dev, > MDIO_PCS_EEE_ABLE, > MDIO_MMD_PCS); > - if (eee_cap < 0) { > - priv->eee_active = 0; > - return false; > - } > + if (eee_cap < 0) > + goto set_inactive; > > cap = mmd_eee_cap_to_ethtool_sup_t(eee_cap); > - if (!cap) { > - priv->eee_active = 0; > - return false; > - } > + if (!cap) > + goto set_inactive; > > eee_lp = ax88179_phy_read_mmd_indirect(dev, > MDIO_AN_EEE_LPABLE, > MDIO_MMD_AN); > - if (eee_lp < 0) { > - priv->eee_active = 0; > - return false; > - } > + if (eee_lp < 0) > + goto set_inactive; > > eee_adv = ax88179_phy_read_mmd_indirect(dev, > MDIO_AN_EEE_ADV, > MDIO_MMD_AN); > - > - if (eee_adv < 0) { > - priv->eee_active = 0; > - return false; > - } > + if (eee_adv < 0) > + goto set_inactive; > > adv = mmd_eee_adv_to_ethtool_adv_t(eee_adv); > lp = mmd_eee_adv_to_ethtool_adv_t(eee_lp); > supported = (ecmd.speed == SPEED_1000) ? > SUPPORTED_1000baseT_Full : > SUPPORTED_100baseT_Full; > - > - if (!(lp & adv & supported)) { > - priv->eee_active = 0; > - return false; > - } > + if (!(lp & adv & supported)) > + goto set_inactive; > > priv->eee_active = 1; > return true; > } > - > +set_inactive: > priv->eee_active = 0; > return false; > }