Messages in this thread Patch in this message | | | From | Oscar Carter <> | Subject | [PATCH v3] staging: vt6656: Add formula to the vnt_rf_addpower function | Date | Sat, 25 Apr 2020 16:15:14 +0200 |
| |
Use a formula to calculate the return value of the vnt_rf_addpower function instead of the "if" statement with literal values for every case.
Signed-off-by: Oscar Carter <oscar.carter@gmx.com> --- Changelog v1 -> v2 - Change the type of "base" variable from s32 to int as Dan Carpenter suggested. - Remove the "--" postoperator and replace with (base - 1) as Dan Carpenter suggested. Also, as this expression has a minus before the parenthesis, remove it an apply the minus operator changing the sign of "base" and literal "1".
Changelog v2 -> v3 - Replace ternary operators with the equivalents "if" statements as Greg Kroah-Hartman suggested.
drivers/staging/vt6656/rf.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c index 06fa8867cfa3..05c9d06f84dd 100644 --- a/drivers/staging/vt6656/rf.c +++ b/drivers/staging/vt6656/rf.c @@ -538,26 +538,19 @@ int vnt_rf_write_embedded(struct vnt_private *priv, u32 data)
static u8 vnt_rf_addpower(struct vnt_private *priv) { + int base; s32 rssi = -priv->current_rssi;
if (!rssi) return 7;
- if (priv->rf_type == RF_VT3226D0) { - if (rssi < -70) - return 9; - else if (rssi < -65) - return 7; - else if (rssi < -60) - return 5; - } else { - if (rssi < -80) - return 9; - else if (rssi < -75) - return 7; - else if (rssi < -70) - return 5; - } + if (priv->rf_type == RF_VT3226D0) + base = -60; + else + base = -70; + + if (rssi < base) + return ((rssi - base + 1) / -5) * 2 + 5;
return 0; } -- 2.20.1
| |