UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: vt6655: remove duplicate code 

In the definition of vnt_init_bands(), there are two sections of
code that are very similar. Unifying them through a new
function that takes care of initialization of a single band.

Signed-off-by: Edmundo Carmona Antoranz <eantoranz@gmail.com>
Link: https://lore.kernel.org/r/20210314145943.1933245-3-eantoranz@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Edmundo Carmona Antoranz 2021-03-14 08:59:43 -06:00 committed by Greg Kroah-Hartman
parent c170f1687b
commit ebf4824798
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/staging/vt6655/channel.c
View File

@ -114,40 +114,38 @@ static struct ieee80211_supported_band vnt_supported_5ghz_band = {
.n_bitrates = ARRAY_SIZE(vnt_rates_a), .n_bitrates = ARRAY_SIZE(vnt_rates_a),
}; };
void vnt_init_bands(struct vnt_private *priv) static void vnt_init_band(struct vnt_private *priv,
struct ieee80211_supported_band *supported_band,
enum nl80211_band band)
{ {
struct ieee80211_channel *ch;
int i; int i;
for (i = 0; i < supported_band->n_channels; i++) {
supported_band->channels[i].max_power = 0x3f;
supported_band->channels[i].flags =
IEEE80211_CHAN_NO_HT40;
}
priv->hw->wiphy->bands[band] = supported_band;
}
void vnt_init_bands(struct vnt_private *priv)
{
switch (priv->byRFType) { switch (priv->byRFType) {
case RF_AIROHA7230: case RF_AIROHA7230:
case RF_UW2452: case RF_UW2452:
case RF_NOTHING: case RF_NOTHING:
default: default:
ch = vnt_channels_5ghz; vnt_init_band(priv, &vnt_supported_5ghz_band,
NL80211_BAND_5GHZ);
for (i = 0; i < ARRAY_SIZE(vnt_channels_5ghz); i++) {
ch[i].max_power = 0x3f;
ch[i].flags = IEEE80211_CHAN_NO_HT40;
}
priv->hw->wiphy->bands[NL80211_BAND_5GHZ] =
&vnt_supported_5ghz_band;
fallthrough; fallthrough;
case RF_RFMD2959: case RF_RFMD2959:
case RF_AIROHA: case RF_AIROHA:
case RF_AL2230S: case RF_AL2230S:
case RF_UW2451: case RF_UW2451:
case RF_VT3226: case RF_VT3226:
ch = vnt_channels_2ghz; vnt_init_band(priv, &vnt_supported_2ghz_band,
NL80211_BAND_2GHZ);
for (i = 0; i < ARRAY_SIZE(vnt_channels_2ghz); i++) {
ch[i].max_power = 0x3f;
ch[i].flags = IEEE80211_CHAN_NO_HT40;
}
priv->hw->wiphy->bands[NL80211_BAND_2GHZ] =
&vnt_supported_2ghz_band;
break; break;
} }
} }