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

staging: vt6656: Refactor the vnt_ofdm_min_rate function

Replace the for loop by a ternary operator whose condition is an AND
bitmask against the priv->basic_rates variable.

The purpose of the for loop was to check if any of bits from RATE_54M to
RATE_6M was set, but it's not necessary to check every individual bit.
The same result can be achieved using only one single mask which
comprises all the commented bits.

This way avoid the iteration over an unnecessary for loop.

Also change the return type to bool because it's the type that this
function returns.
Signed-off-by: default avatarOscar Carter <oscar.carter@gmx.com>
Link: https://lore.kernel.org/r/20200418134553.6415-1-oscar.carter@gmx.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3436ce6
...@@ -248,16 +248,9 @@ void vnt_update_top_rates(struct vnt_private *priv) ...@@ -248,16 +248,9 @@ void vnt_update_top_rates(struct vnt_private *priv)
priv->top_cck_basic_rate = top_cck; priv->top_cck_basic_rate = top_cck;
} }
int vnt_ofdm_min_rate(struct vnt_private *priv) bool vnt_ofdm_min_rate(struct vnt_private *priv)
{ {
int ii; return priv->basic_rates & GENMASK(RATE_54M, RATE_6M) ? true : false;
for (ii = RATE_54M; ii >= RATE_6M; ii--) {
if ((priv->basic_rates) & ((u16)BIT(ii)))
return true;
}
return false;
} }
u8 vnt_get_pkt_type(struct vnt_private *priv) u8 vnt_get_pkt_type(struct vnt_private *priv)
......
...@@ -29,7 +29,7 @@ void vnt_set_channel(struct vnt_private *priv, u32 connection_channel); ...@@ -29,7 +29,7 @@ void vnt_set_channel(struct vnt_private *priv, u32 connection_channel);
void vnt_set_rspinf(struct vnt_private *priv, u8 bb_type); void vnt_set_rspinf(struct vnt_private *priv, u8 bb_type);
void vnt_update_ifs(struct vnt_private *priv); 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);
int vnt_ofdm_min_rate(struct vnt_private *priv); bool vnt_ofdm_min_rate(struct vnt_private *priv);
void vnt_adjust_tsf(struct vnt_private *priv, u8 rx_rate, void vnt_adjust_tsf(struct vnt_private *priv, u8 rx_rate,
u64 time_stamp, u64 local_tsf); u64 time_stamp, u64 local_tsf);
bool vnt_get_current_tsf(struct vnt_private *priv, u64 *current_tsf); bool vnt_get_current_tsf(struct vnt_private *priv, u64 *current_tsf);
......
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