From patchwork Wed Jan 30 00:37:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 1033072 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=none (p=none dis=none) header.from=lunn.ch Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=lunn.ch header.i=@lunn.ch header.b="n+N1eML3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43q4P26mPHz9s9G for ; Wed, 30 Jan 2019 11:43:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727641AbfA3Ant (ORCPT ); Tue, 29 Jan 2019 19:43:49 -0500 Received: from vps0.lunn.ch ([185.16.172.187]:60027 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726371AbfA3Ant (ORCPT ); Tue, 29 Jan 2019 19:43:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lunn.ch; s=20171124; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=5wI3WIyHltAjTXeL/COuBBDbYQ29XRyYlPQlhROQV3c=; b=n+N1eML37fM4UOa0JHAWDl+xBW zLCa9Vf2AEuJrN/Kx9UahZw2lm/Jd9vDeR8cZvw76eTD61j7jT0yygGEhcvZ+T2mQZTrmYCAMbRjC fkr/eM4fvKU9xEDWotpSOSqamWkJBfPCwUuKZ21HlQyRC2moqzucglT2WrNXMv8wO4lU=; Received: from andrew by vps0.lunn.ch with local (Exim 4.89) (envelope-from ) id 1godtb-0006Dw-4N; Wed, 30 Jan 2019 01:38:27 +0100 From: Andrew Lunn To: netdev Cc: Vivien Didelot , Florian Fainelli , Pavel Machek , Andrew Lunn Subject: [PATCH RFC RFT net-next 04/10] net: dsa: mv88e6060: Replace REG_READ macro Date: Wed, 30 Jan 2019 01:37:52 +0100 Message-Id: <20190130003758.23852-5-andrew@lunn.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190130003758.23852-1-andrew@lunn.ch> References: <20190130003758.23852-1-andrew@lunn.ch> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The REG_READ macro contains a return statement, making it not very safe. Remove it by inlining the code. Signed-off-by: Andrew Lunn --- drivers/net/dsa/mv88e6060.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c index da88c56e092c..00fdf155dcec 100644 --- a/drivers/net/dsa/mv88e6060.c +++ b/drivers/net/dsa/mv88e6060.c @@ -23,17 +23,6 @@ static int reg_read(struct mv88e6060_priv *priv, int addr, int reg) return mdiobus_read_nested(priv->bus, priv->sw_addr + addr, reg); } -#define REG_READ(addr, reg) \ - ({ \ - int __ret; \ - \ - __ret = reg_read(priv, addr, reg); \ - if (__ret < 0) \ - return __ret; \ - __ret; \ - }) - - static int reg_write(struct mv88e6060_priv *priv, int addr, int reg, u16 val) { return mdiobus_write_nested(priv->bus, priv->sw_addr + addr, reg, val); @@ -92,7 +81,9 @@ static int mv88e6060_switch_reset(struct mv88e6060_priv *priv) /* Set all ports to the disabled state. */ for (i = 0; i < MV88E6060_PORTS; i++) { - ret = REG_READ(REG_PORT(i), PORT_CONTROL); + ret = reg_read(priv, REG_PORT(i), PORT_CONTROL); + if (ret < 0) + return ret; ret = reg_write(priv, REG_PORT(i), PORT_CONTROL, ret & ~PORT_CONTROL_STATE_MASK); if (ret) @@ -112,7 +103,10 @@ static int mv88e6060_switch_reset(struct mv88e6060_priv *priv) /* Wait up to one second for reset to complete. */ timeout = jiffies + 1 * HZ; while (time_before(jiffies, timeout)) { - ret = REG_READ(REG_GLOBAL, GLOBAL_STATUS); + ret = reg_read(priv, REG_GLOBAL, GLOBAL_STATUS); + if (ret < 0) + return ret; + if (ret & GLOBAL_STATUS_INIT_READY) break;