Commit bf42304b authored by Oscar Carter's avatar Oscar Carter Committed by Greg Kroah-Hartman

staging: vt6656: Use fls instead of for loop in vnt_update_top_rates

Replace the for loops of the vnt_update_top_rates function by the fls
function.

The purpose of the two for loops is to find the most significant bit set
in a range of bits. So, they can be replace by the fls function (find
last set) with a previous mask to define the range.

This way avoid the iteration over unnecessary for loops.

The header "linux/bits.h" can be remove as it is included in the header
"linux/bitops.h".
Signed-off-by: default avatarOscar Carter <oscar.carter@gmx.com>
Link: https://lore.kernel.org/r/20200420155246.4925-1-oscar.carter@gmx.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9f8c9f4a
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* *
*/ */
#include <linux/bits.h> #include <linux/bitops.h>
#include "device.h" #include "device.h"
#include "card.h" #include "card.h"
#include "baseband.h" #include "baseband.h"
...@@ -223,29 +223,13 @@ void vnt_update_ifs(struct vnt_private *priv) ...@@ -223,29 +223,13 @@ void vnt_update_ifs(struct vnt_private *priv)
void vnt_update_top_rates(struct vnt_private *priv) void vnt_update_top_rates(struct vnt_private *priv)
{ {
u8 top_ofdm = RATE_24M, top_cck = RATE_1M; int pos;
u8 i;
/*Determines the highest basic rate.*/ pos = fls(priv->basic_rates & GENMASK(RATE_54M, RATE_6M));
for (i = RATE_54M; i >= RATE_6M; i--) { priv->top_ofdm_basic_rate = pos ? (pos - 1) : RATE_24M;
if (priv->basic_rates & BIT(i)) {
top_ofdm = i;
break;
}
}
priv->top_ofdm_basic_rate = top_ofdm;
for (i = RATE_11M;; i--) {
if (priv->basic_rates & BIT(i)) {
top_cck = i;
break;
}
if (i == RATE_1M)
break;
}
priv->top_cck_basic_rate = top_cck; pos = fls(priv->basic_rates & GENMASK(RATE_11M, RATE_1M));
priv->top_cck_basic_rate = pos ? (pos - 1) : RATE_1M;
} }
bool vnt_ofdm_min_rate(struct vnt_private *priv) bool vnt_ofdm_min_rate(struct vnt_private *priv)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment