* [PATCH] Staging: rtl8188eu: Refactored code to increase readility
@ 2015-02-23 18:10 Vatika Harlalka
2015-02-23 20:14 ` [Outreachy kernel] " Jes Sorensen
0 siblings, 1 reply; 2+ messages in thread
From: Vatika Harlalka @ 2015-02-23 18:10 UTC (permalink / raw)
To: outreachy-kernel
Refactored the conditional code to make it more compact.
Replaced the ternary operators with abs() macro to increase readability.
Signed-off-by: Vatika Harlalka <vatikaharlalka@gmail.com>
---
drivers/staging/rtl8188eu/hal/phy.c | 32 ++++++++++++--------------------
1 file changed, 12 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
index 3f663fe..f256004 100644
--- a/drivers/staging/rtl8188eu/hal/phy.c
+++ b/drivers/staging/rtl8188eu/hal/phy.c
@@ -570,27 +570,19 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)
if (thermal_avg_count)
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);
- dm_odm->RFCalibrateInfo.bReloadtxpowerindex = false;
- dm_odm->RFCalibrateInfo.bDoneTxpower = false;
- } else if (dm_odm->RFCalibrateInfo.bDoneTxpower) {
- delta = (thermal_val > dm_odm->RFCalibrateInfo.ThermalValue) ?
- (thermal_val - dm_odm->RFCalibrateInfo.ThermalValue) :
- (dm_odm->RFCalibrateInfo.ThermalValue - thermal_val);
- } else {
- delta = thermal_val > hal_data->EEPROMThermalMeter ?
- (thermal_val - hal_data->EEPROMThermalMeter) :
- (hal_data->EEPROMThermalMeter - thermal_val);
+ if (dm_odm->RFCalibrateInfo.bDoneTxpower &&
+ !dm_odm->RFCalibrateInfo.bReloadtxpowerindex)
+ delta = abs(thermal_val - dm_odm->RFCalibrateInfo.ThermalValue);
+ else {
+ delta = abs(thermal_val - hal_data->EEPROMThermalMeter);
+ if (dm_odm->RFCalibrateInfo.bReloadtxpowerindex) {
+ dm_odm->RFCalibrateInfo.bReloadtxpowerindex = false;
+ dm_odm->RFCalibrateInfo.bDoneTxpower = false;
+ }
}
- delta_lck = (thermal_val > dm_odm->RFCalibrateInfo.ThermalValue_LCK) ?
- (thermal_val - dm_odm->RFCalibrateInfo.ThermalValue_LCK) :
- (dm_odm->RFCalibrateInfo.ThermalValue_LCK - thermal_val);
- delta_iqk = (thermal_val > dm_odm->RFCalibrateInfo.ThermalValue_IQK) ?
- (thermal_val - dm_odm->RFCalibrateInfo.ThermalValue_IQK) :
- (dm_odm->RFCalibrateInfo.ThermalValue_IQK - thermal_val);
+
+ delta_lck = abs(dm_odm->RFCalibrateInfo.ThermalValue_LCK - thermal_val);
+ delta_iqk = abs(dm_odm->RFCalibrateInfo.ThermalValue_IQK - thermal_val);
/* Delta temperature is equal to or larger than 20 centigrade.*/
if ((delta_lck >= 8)) {
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Outreachy kernel] [PATCH] Staging: rtl8188eu: Refactored code to increase readility
2015-02-23 18:10 [PATCH] Staging: rtl8188eu: Refactored code to increase readility Vatika Harlalka
@ 2015-02-23 20:14 ` Jes Sorensen
0 siblings, 0 replies; 2+ messages in thread
From: Jes Sorensen @ 2015-02-23 20:14 UTC (permalink / raw)
To: Vatika Harlalka, outreachy-kernel
On 02/23/15 13:10, Vatika Harlalka wrote:
> Refactored the conditional code to make it more compact.
> Replaced the ternary operators with abs() macro to increase readability.
>
> Signed-off-by: Vatika Harlalka <vatikaharlalka@gmail.com>
> ---
> drivers/staging/rtl8188eu/hal/phy.c | 32 ++++++++++++--------------------
> 1 file changed, 12 insertions(+), 20 deletions(-)
This is a very nice cleanup.
Jes
> diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
> index 3f663fe..f256004 100644
> --- a/drivers/staging/rtl8188eu/hal/phy.c
> +++ b/drivers/staging/rtl8188eu/hal/phy.c
> @@ -570,27 +570,19 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)
> if (thermal_avg_count)
> 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);
> - dm_odm->RFCalibrateInfo.bReloadtxpowerindex = false;
> - dm_odm->RFCalibrateInfo.bDoneTxpower = false;
> - } else if (dm_odm->RFCalibrateInfo.bDoneTxpower) {
> - delta = (thermal_val > dm_odm->RFCalibrateInfo.ThermalValue) ?
> - (thermal_val - dm_odm->RFCalibrateInfo.ThermalValue) :
> - (dm_odm->RFCalibrateInfo.ThermalValue - thermal_val);
> - } else {
> - delta = thermal_val > hal_data->EEPROMThermalMeter ?
> - (thermal_val - hal_data->EEPROMThermalMeter) :
> - (hal_data->EEPROMThermalMeter - thermal_val);
> + if (dm_odm->RFCalibrateInfo.bDoneTxpower &&
> + !dm_odm->RFCalibrateInfo.bReloadtxpowerindex)
> + delta = abs(thermal_val - dm_odm->RFCalibrateInfo.ThermalValue);
> + else {
> + delta = abs(thermal_val - hal_data->EEPROMThermalMeter);
> + if (dm_odm->RFCalibrateInfo.bReloadtxpowerindex) {
> + dm_odm->RFCalibrateInfo.bReloadtxpowerindex = false;
> + dm_odm->RFCalibrateInfo.bDoneTxpower = false;
> + }
> }
> - delta_lck = (thermal_val > dm_odm->RFCalibrateInfo.ThermalValue_LCK) ?
> - (thermal_val - dm_odm->RFCalibrateInfo.ThermalValue_LCK) :
> - (dm_odm->RFCalibrateInfo.ThermalValue_LCK - thermal_val);
> - delta_iqk = (thermal_val > dm_odm->RFCalibrateInfo.ThermalValue_IQK) ?
> - (thermal_val - dm_odm->RFCalibrateInfo.ThermalValue_IQK) :
> - (dm_odm->RFCalibrateInfo.ThermalValue_IQK - thermal_val);
> +
> + delta_lck = abs(dm_odm->RFCalibrateInfo.ThermalValue_LCK - thermal_val);
> + delta_iqk = abs(dm_odm->RFCalibrateInfo.ThermalValue_IQK - thermal_val);
>
> /* Delta temperature is equal to or larger than 20 centigrade.*/
> if ((delta_lck >= 8)) {
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-23 20:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-23 18:10 [PATCH] Staging: rtl8188eu: Refactored code to increase readility Vatika Harlalka
2015-02-23 20:14 ` [Outreachy kernel] " Jes Sorensen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.