[dpdk-dev] [PATCH] e1000/base: Add missing braces to the 'if' statements

[Markos Chandras]

Hi Anupam,

I have seen your commit, but my patch fixes a different file (although 
the fix is similar).

Am I missing something?

On 2016-06-23 11:26, Anupam Kapoor wrote:
> hi markos,
> 
> please see : cba50f6be0db9efdf694dcf4bce4a6945a275182, which should 
> already
> fix this.
> 
> --
> thanks
> anupam
> 
> 
> On Thu, Jun 23, 2016 at 2:55 PM, Markos Chandras <mchandras at suse.de> 
> wrote:
> 
>> 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 <mchandras at suse.de>
>> ---
>>  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
>> 
>> 

-- 
SUSE LINUX GmbH | GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg) Maxfeldstr. 5, D-90409, Nürnberg