[PATCH] Staging: rtl8188eu: Replace ternary operator with predefined macro

[PATCH] Staging: rtl8188eu: Replace ternary operator with predefined macro

[Vatika Harlalka]

Replace use of ternary operator with abs() macro to increase
code readability.

Signed-off-by: Vatika Harlalka <vatikaharlalka@gmail.com>
---
 drivers/staging/rtl8188eu/hal/phy.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
index e7ede44..115d611 100644
--- a/drivers/staging/rtl8188eu/hal/phy.c
+++ b/drivers/staging/rtl8188eu/hal/phy.c
@@ -554,9 +554,7 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)
 			thermal_val = (u8)(thermal_avg / thermal_avg_count);
 
 		if (dm_odm->RFCalibrateInfo.bReloadtxpowerindex) {
-			delta = thermal_val > hal_data->EEPROMThermalMeter ?
-				(thermal_val - hal_data->EEPROMThermalMeter) :
-				(hal_data->EEPROMThermalMeter - thermal_val);
+			delta = abs(thermal_val - hal_data->EEPROMThermalMeter);
 			dm_odm->RFCalibrateInfo.bReloadtxpowerindex = false;
 			dm_odm->RFCalibrateInfo.bDoneTxpower = false;
 		} else if (dm_odm->RFCalibrateInfo.bDoneTxpower) {
-- 
1.9.1

Re: [Outreachy kernel] [PATCH] Staging: rtl8188eu: Replace ternary operator with predefined macro

[Julia Lawall]

On Mon, 23 Feb 2015, Vatika Harlalka wrote:

> Replace use of ternary operator with abs() macro to increase
> code readability.

This is nice.  You could see if you can use Coccinelle to find other
occurrences.

julia


> Signed-off-by: Vatika Harlalka <vatikaharlalka@gmail.com>
> ---
>  drivers/staging/rtl8188eu/hal/phy.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
> index e7ede44..115d611 100644
> --- a/drivers/staging/rtl8188eu/hal/phy.c
> +++ b/drivers/staging/rtl8188eu/hal/phy.c
> @@ -554,9 +554,7 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)
>  			thermal_val = (u8)(thermal_avg / thermal_avg_count);
>
>  		if (dm_odm->RFCalibrateInfo.bReloadtxpowerindex) {
> -			delta = thermal_val > hal_data->EEPROMThermalMeter ?
> -				(thermal_val - hal_data->EEPROMThermalMeter) :
> -				(hal_data->EEPROMThermalMeter - thermal_val);
> +			delta = abs(thermal_val - hal_data->EEPROMThermalMeter);
>  			dm_odm->RFCalibrateInfo.bReloadtxpowerindex = false;
>  			dm_odm->RFCalibrateInfo.bDoneTxpower = false;
>  		} else if (dm_odm->RFCalibrateInfo.bDoneTxpower) {
> --
> 1.9.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20150223162709.GA16766%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>

Re: [Outreachy kernel] [PATCH] Staging: rtl8188eu: Replace ternary operator with predefined macro

[Greg KH]

On Mon, Feb 23, 2015 at 09:57:09PM +0530, Vatika Harlalka wrote:
> Replace use of ternary operator with abs() macro to increase
> code readability.
> 
> Signed-off-by: Vatika Harlalka <vatikaharlalka@gmail.com>
> ---
>  drivers/staging/rtl8188eu/hal/phy.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
> index e7ede44..115d611 100644
> --- a/drivers/staging/rtl8188eu/hal/phy.c
> +++ b/drivers/staging/rtl8188eu/hal/phy.c
> @@ -554,9 +554,7 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)
>  			thermal_val = (u8)(thermal_avg / thermal_avg_count);
>  
>  		if (dm_odm->RFCalibrateInfo.bReloadtxpowerindex) {
> -			delta = thermal_val > hal_data->EEPROMThermalMeter ?
> -				(thermal_val - hal_data->EEPROMThermalMeter) :
> -				(hal_data->EEPROMThermalMeter - thermal_val);
> +			delta = abs(thermal_val - hal_data->EEPROMThermalMeter);
>  			dm_odm->RFCalibrateInfo.bReloadtxpowerindex = false;
>  			dm_odm->RFCalibrateInfo.bDoneTxpower = false;
>  		} else if (dm_odm->RFCalibrateInfo.bDoneTxpower) {

With the other changes you have made in this file, this patch no longer
applies :(

Can you please refresh your tree against my staging-testing branch and
respin this patch and resend it?

thanks,

greg k-h