From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by dpdk.org (Postfix) with ESMTP id EEDF6C412 for ; Thu, 23 Jun 2016 11:26:00 +0200 (CEST) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 7DE1CAC6E for ; Thu, 23 Jun 2016 09:26:00 +0000 (UTC) From: Markos Chandras To: dev@dpdk.org Cc: Markos Chandras Date: Thu, 23 Jun 2016 10:25:52 +0100 Message-Id: <20160623092552.30932-1-mchandras@suse.de> X-Mailer: git-send-email 2.8.4 Subject: [dpdk-dev] [PATCH] e1000/base: Add missing braces to the 'if' statements X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2016 09:26:01 -0000 Add the missing braces to the 'if' statements to fix the misleading identation. This also fixes the following build errors when building with gcc >= 6: drivers/net/e1000/base/e1000_phy.c:4156:2: error: this 'if' clause does not guard... [-Werror=misleading-indentation] if (locked) ^~ drivers/net/e1000/base/e1000_phy.c:4158:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' if (!ready) ^~ drivers/net/e1000/base/e1000_phy.c: In function 'e1000_write_phy_reg_mphy': drivers/net/e1000/base/e1000_phy.c:4221:2: error: this 'if' clause does not guard... [-Werror=misleading-indentation] if (locked) ^~ drivers/net/e1000/base/e1000_phy.c:4223:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' if (!ready) ^~ Signed-off-by: Markos Chandras --- drivers/net/e1000/base/e1000_phy.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/e1000/base/e1000_phy.c b/drivers/net/e1000/base/e1000_phy.c index d43b7ce..33f478b 100644 --- a/drivers/net/e1000/base/e1000_phy.c +++ b/drivers/net/e1000/base/e1000_phy.c @@ -4153,12 +4153,13 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data) *data = E1000_READ_REG(hw, E1000_MPHY_DATA); /* Disable access to mPHY if it was originally disabled */ - if (locked) + if (locked) { ready = e1000_is_mphy_ready(hw); if (!ready) return -E1000_ERR_PHY; E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, E1000_MPHY_DIS_ACCESS); + } return E1000_SUCCESS; } @@ -4218,12 +4219,13 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data, E1000_WRITE_REG(hw, E1000_MPHY_DATA, data); /* Disable access to mPHY if it was originally disabled */ - if (locked) + if (locked) { ready = e1000_is_mphy_ready(hw); if (!ready) return -E1000_ERR_PHY; E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, E1000_MPHY_DIS_ACCESS); + } return E1000_SUCCESS; } -- 2.8.4