From patchwork Mon Jun 12 09:57:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 9780667 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 916C960212 for ; Mon, 12 Jun 2017 10:00:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82A7A2853D for ; Mon, 12 Jun 2017 10:00:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75712285E9; Mon, 12 Jun 2017 10:00:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2B2242853D for ; Mon, 12 Jun 2017 10:00:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=eSAngplycWdxA5SobD1ro/YGd/WrGXWGf6dIfIntkso=; b=RDBEGs6lXKexINBjjJ4XZcqKUF DJCaOxpLiaKW7LOPhjnZ4PnpzZkbAcqoRXYBzcaC3RD+q77sXIZxdQunVQmzXrirBiteDOhu3lLjN fj4HSPO7Imt+psQj4RAgH9hLbjwZkQv6btY6TrGDyF0zpk8WUPQGMIWqKxB0q4PmmwkC8E160OtzE /MMmYTVv3eZbFIT/ZOQOzlysNOdV9M4VHatuec8ZvSfRoGb1QMyjAt5jqHEuyi7m0cdqtWljHMJMf 26WGX+dhQIaqGEFHpv108Iel7q6+bfl0rnZ97ZtPUVCGcPhPinTPhULDTHw5sjtc5WIcbqjiNoLrN qN2bxtgw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dKM9Q-0002Tb-Er; Mon, 12 Jun 2017 10:00:48 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dKM9D-0002F9-5h for linux-arm-kernel@lists.infradead.org; Mon, 12 Jun 2017 10:00:38 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 8EB7721E2F; Mon, 12 Jun 2017 12:00:16 +0200 (CEST) Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id BBBA021DF9; Mon, 12 Jun 2017 12:00:02 +0200 (CEST) From: Antoine Tenart To: davem@davemloft.net, jason@lakedaemon.net, andrew@lunn.ch, gregory.clement@free-electrons.com, sebastian.hesselbarth@gmail.com, f.fainelli@gmail.com Subject: [PATCH v3 4/9] net: mvmdio: move the read valid check into its own function Date: Mon, 12 Jun 2017 11:57:40 +0200 Message-Id: <20170612095745.11300-5-antoine.tenart@free-electrons.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170612095745.11300-1-antoine.tenart@free-electrons.com> References: <20170612095745.11300-1-antoine.tenart@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170612_030035_365221_34723BB7 X-CRM114-Status: GOOD ( 12.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.petazzoni@free-electrons.com, netdev@vger.kernel.org, Antoine Tenart , linux@armlinux.org.uk, nadavh@marvell.com, mw@semihalf.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Move the read valid check in its own function. This is needed as a requirement to factorize the driver to add the xMDIO support in the future. Signed-off-by: Antoine Tenart --- drivers/net/ethernet/marvell/mvmdio.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c index 583f1c5753c2..2ed819d25305 100644 --- a/drivers/net/ethernet/marvell/mvmdio.c +++ b/drivers/net/ethernet/marvell/mvmdio.c @@ -69,6 +69,11 @@ static int orion_mdio_smi_is_done(struct orion_mdio_dev *dev) return !(readl(dev->regs) & MVMDIO_SMI_BUSY); } +static int orion_mdio_smi_is_read_valid(struct orion_mdio_dev *dev) +{ + return readl(dev->regs) & MVMDIO_SMI_READ_VALID; +} + /* Wait for the SMI unit to be ready for another operation */ static int orion_mdio_wait_ready(struct mii_bus *bus) @@ -113,7 +118,6 @@ static int orion_mdio_read(struct mii_bus *bus, int mii_id, int regnum) { struct orion_mdio_dev *dev = bus->priv; - u32 val; int ret; mutex_lock(&dev->lock); @@ -131,14 +135,13 @@ static int orion_mdio_read(struct mii_bus *bus, int mii_id, if (ret < 0) goto out; - val = readl(dev->regs); - if (!(val & MVMDIO_SMI_READ_VALID)) { + if (!orion_mdio_smi_is_read_valid(dev)) { dev_err(bus->parent, "SMI bus read not valid\n"); ret = -ENODEV; goto out; } - ret = val & GENMASK(15, 0); + ret = readl(dev->regs) & GENMASK(15, 0); out: mutex_unlock(&dev->lock); return ret;