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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 E46E6C43331 for ; Wed, 3 Mar 2021 04:24:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9AC5F64EDF for ; Wed, 3 Mar 2021 04:24:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1840282AbhCCEHy (ORCPT ); Tue, 2 Mar 2021 23:07:54 -0500 Received: from vps0.lunn.ch ([185.16.172.187]:36400 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233783AbhCCBYv (ORCPT ); Tue, 2 Mar 2021 20:24:51 -0500 Received: from andrew by vps0.lunn.ch with local (Exim 4.94) (envelope-from ) id 1lHGEp-0096tc-It; Wed, 03 Mar 2021 02:23:43 +0100 Date: Wed, 3 Mar 2021 02:23:43 +0100 From: Andrew Lunn To: Joakim Zhang Cc: peppe.cavallaro@st.com, alexandre.torgue@st.com, joabreu@synopsys.com, davem@davemloft.net, kuba@kernel.org, f.fainelli@gmail.com, linux-imx@nxp.com, netdev@vger.kernel.org Subject: Re: [RFC V2 resend net-next 1/3] net: stmmac: add clocks management for gmac driver Message-ID: References: <20210301102529.18573-1-qiangqing.zhang@nxp.com> <20210301102529.18573-2-qiangqing.zhang@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210301102529.18573-2-qiangqing.zhang@nxp.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, Mar 01, 2021 at 06:25:27PM +0800, Joakim Zhang wrote: > @@ -121,11 +132,22 @@ static int stmmac_xgmac2_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg) > > /* Wait until any existing MII operation is complete */ > if (readl_poll_timeout(priv->ioaddr + mii_data, tmp, > - !(tmp & MII_XGMAC_BUSY), 100, 10000)) > - return -EBUSY; > + !(tmp & MII_XGMAC_BUSY), 100, 10000)) { > + ret = -EBUSY; > + goto err_disable_clks; > + } > > /* Read the data from the MII data register */ > - return readl(priv->ioaddr + mii_data) & GENMASK(15, 0); > + data = (int)readl(priv->ioaddr + mii_data) & GENMASK(15, 0); > + > + pm_runtime_put(priv->device); > + > + return data; > + > +err_disable_clks: > + pm_runtime_put(priv->device); > + > + return ret; Hi Joakim You could do ret = (int)readl(priv->ioaddr + mii_data) & GENMASK(15, 0); err_disable_clks: pm_runtime_put(priv->device); return ret; Slightly simpler. > > /* Read the data from the MII data register */ > data = (int)readl(priv->ioaddr + mii_data) & MII_DATA_MASK; > > + pm_runtime_put(priv->device); > + > return data; > + > +err_disable_clks: > + pm_runtime_put(priv->device); > + > + return ret; > } Same here. Otherwise: Reviewed-by: Andrew Lunn Andrew