Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1359702 > unrolled thread

[PATCH] rtlwifi: fix gcc-6 indentation warning

Back to article view | Back to linux.kernel

Contents

  [PATCH] rtlwifi: fix gcc-6 indentation warning Arnd Bergmann <arnd@arndb.de> - 2016-03-17 11:10 +0100
    Re: [PATCH] rtlwifi: fix gcc-6 indentation warning Larry Finger <Larry.Finger@lwfinger.net> - 2016-03-17 17:10 +0100

#1359702 — [PATCH] rtlwifi: fix gcc-6 indentation warning

The rtl8821ae_dm_txpower_tracking_callback_thermalmeter function
contains a call to RT_TRACE() that is indented in a misleading
way, as pointed out by a gcc-6 warning:

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c: In function 'rtl8821ae_dm_txpower_tracking_callback_thermalmeter':
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c:2491:4: error: statement is indented as if it were guarded by...
    RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
    ^~~~~~~~
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c:2488:3: note: ...this 'for' clause, but it is not
   for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++)
   ^~~

It is clear from the context that the call was not meant to be
part of the loop and only the indentation is wrong, so this
removes the extra tabs.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
index 95dcbff4673b..6a8245c4ea48 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
@@ -2488,9 +2488,9 @@ void rtl8821ae_dm_txpower_tracking_callback_thermalmeter(
 		for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++)
 			rtldm->swing_idx_ofdm_base[p] = rtldm->swing_idx_ofdm[p];
 
-			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-				 "pDM_Odm->RFCalibrateInfo.ThermalValue = %d ThermalValue= %d\n",
-				 rtldm->thermalvalue, thermal_value);
+		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
+			 "pDM_Odm->RFCalibrateInfo.ThermalValue = %d ThermalValue= %d\n",
+			 rtldm->thermalvalue, thermal_value);
 		/*Record last Power Tracking Thermal Value*/
 		rtldm->thermalvalue = thermal_value;
 	}
-- 
2.7.0

[toc] | [next] | [standalone]

#1359984

On 03/17/2016 05:03 AM, Arnd Bergmann wrote:
> The rtl8821ae_dm_txpower_tracking_callback_thermalmeter function
> contains a call to RT_TRACE() that is indented in a misleading
> way, as pointed out by a gcc-6 warning:
>
> drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c: In function 'rtl8821ae_dm_txpower_tracking_callback_thermalmeter':
> drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c:2491:4: error: statement is indented as if it were guarded by...
>      RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
>      ^~~~~~~~
> drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c:2488:3: note: ...this 'for' clause, but it is not
>     for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++)
>     ^~~
>
> It is clear from the context that the call was not meant to be
> part of the loop and only the indentation is wrong, so this
> removes the extra tabs.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>   drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
> index 95dcbff4673b..6a8245c4ea48 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/dm.c
> @@ -2488,9 +2488,9 @@ void rtl8821ae_dm_txpower_tracking_callback_thermalmeter(
>   		for (p = RF90_PATH_A; p < MAX_PATH_NUM_8821A; p++)
>   			rtldm->swing_idx_ofdm_base[p] = rtldm->swing_idx_ofdm[p];
>
> -			RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
> -				 "pDM_Odm->RFCalibrateInfo.ThermalValue = %d ThermalValue= %d\n",
> -				 rtldm->thermalvalue, thermal_value);
> +		RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
> +			 "pDM_Odm->RFCalibrateInfo.ThermalValue = %d ThermalValue= %d\n",
> +			 rtldm->thermalvalue, thermal_value);
>   		/*Record last Power Tracking Thermal Value*/
>   		rtldm->thermalvalue = thermal_value;
>   	}
>

This change looks good to me.

Acked-by: Larry Finger <Larry.Finger@lwfinger.net>

Thanks,

Larry

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web