From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D63DFC48BCF for ; Wed, 9 Jun 2021 23:24:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ACA45613EA for ; Wed, 9 Jun 2021 23:24:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229705AbhFIX0b (ORCPT ); Wed, 9 Jun 2021 19:26:31 -0400 Received: from mga12.intel.com ([192.55.52.136]:55247 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229542AbhFIX03 (ORCPT ); Wed, 9 Jun 2021 19:26:29 -0400 IronPort-SDR: 6HpdVh9E5ZKVALH12gUQGOdstkZmMLyigxK6o3SlzpbmrRZzg5Vc1qxizuOzua5ygms4xH0dsH wCpPUYOa8lBQ== X-IronPort-AV: E=McAfee;i="6200,9189,10010"; a="184881136" X-IronPort-AV: E=Sophos;i="5.83,261,1616482800"; d="scan'208";a="184881136" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2021 16:24:31 -0700 IronPort-SDR: Xlgi0XtmMkUsNi8AukI0Cf34BXKT0Q7BtrB8dza4cBG7E+W22tlB3k9D1iYxi0xsQ35VL30uCH eRvCXnEYDuPw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,261,1616482800"; d="scan'208";a="470034494" Received: from linux.intel.com ([10.54.29.200]) by fmsmga004.fm.intel.com with ESMTP; 09 Jun 2021 16:24:31 -0700 Received: from linux.intel.com (vwong3-iLBPG3.png.intel.com [10.88.229.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTPS id 3E2305802A4; Wed, 9 Jun 2021 16:24:27 -0700 (PDT) Date: Thu, 10 Jun 2021 07:24:24 +0800 From: Wong Vee Khee To: Vladimir Oltean Cc: Jakub Kicinski , "David S. Miller" , netdev@vger.kernel.org, Ong Boon Leong , Michael Sit Wei Hong , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Jose Abreu , Maxime Coquelin , Heiner Kallweit , Russell King - ARM Linux admin , Florian Fainelli , Andrew Lunn , Vivien Didelot , Vladimir Oltean Subject: Re: [PATCH net-next 03/13] net: stmmac: reduce indentation when calling stmmac_xpcs_setup Message-ID: <20210609232424.GB8706@linux.intel.com> References: <20210609184155.921662-1-olteanv@gmail.com> <20210609184155.921662-4-olteanv@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210609184155.921662-4-olteanv@gmail.com> User-Agent: Mutt/1.9.4 (2018-02-28) Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Jun 09, 2021 at 09:41:45PM +0300, Vladimir Oltean wrote: > From: Vladimir Oltean > > There is no reason to embed an if within an if, we can just logically > AND the two conditions. > > Signed-off-by: Vladimir Oltean Reviewed-by: Wong Vee Khee > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 1c881ec8cd04..372673f9af30 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -7002,12 +7002,10 @@ int stmmac_dvr_probe(struct device *device, > if (priv->plat->speed_mode_2500) > priv->plat->speed_mode_2500(ndev, priv->plat->bsp_priv); > > - if (priv->plat->mdio_bus_data) { > - if (priv->plat->mdio_bus_data->has_xpcs) { > - ret = stmmac_xpcs_setup(priv->mii); > - if (ret) > - goto error_xpcs_setup; > - } > + if (priv->plat->mdio_bus_data && priv->plat->mdio_bus_data->has_xpcs) { > + ret = stmmac_xpcs_setup(priv->mii); > + if (ret) > + goto error_xpcs_setup; > } > > ret = stmmac_phy_setup(priv); > -- > 2.25.1 >