Skip to content

Commit 1ffba35

Browse files
Philipp Hortmanngregkh
authored andcommitted
staging: vt6655: Remove unused byRFType in channel.c
Remove byRFType that support 5GHz band. Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> Link: https://lore.kernel.org/r/3724590188e72e8f531fe03c2821c5d3d08e2e29.1646512837.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d7e2d1e commit 1ffba35

1 file changed

Lines changed: 1 addition & 84 deletions

File tree

drivers/staging/vt6655/channel.c

Lines changed: 1 addition & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,6 @@ static struct ieee80211_rate vnt_rates_bg[] = {
2525
{ .bitrate = 540, .hw_value = RATE_54M },
2626
};
2727

28-
static struct ieee80211_rate vnt_rates_a[] = {
29-
{ .bitrate = 60, .hw_value = RATE_6M },
30-
{ .bitrate = 90, .hw_value = RATE_9M },
31-
{ .bitrate = 120, .hw_value = RATE_12M },
32-
{ .bitrate = 180, .hw_value = RATE_18M },
33-
{ .bitrate = 240, .hw_value = RATE_24M },
34-
{ .bitrate = 360, .hw_value = RATE_36M },
35-
{ .bitrate = 480, .hw_value = RATE_48M },
36-
{ .bitrate = 540, .hw_value = RATE_54M },
37-
};
38-
3928
static struct ieee80211_channel vnt_channels_2ghz[] = {
4029
{ .center_freq = 2412, .hw_value = 1 },
4130
{ .center_freq = 2417, .hw_value = 2 },
@@ -53,65 +42,13 @@ static struct ieee80211_channel vnt_channels_2ghz[] = {
5342
{ .center_freq = 2484, .hw_value = 14 }
5443
};
5544

56-
static struct ieee80211_channel vnt_channels_5ghz[] = {
57-
{ .center_freq = 4915, .hw_value = 15 },
58-
{ .center_freq = 4920, .hw_value = 16 },
59-
{ .center_freq = 4925, .hw_value = 17 },
60-
{ .center_freq = 4935, .hw_value = 18 },
61-
{ .center_freq = 4940, .hw_value = 19 },
62-
{ .center_freq = 4945, .hw_value = 20 },
63-
{ .center_freq = 4960, .hw_value = 21 },
64-
{ .center_freq = 4980, .hw_value = 22 },
65-
{ .center_freq = 5035, .hw_value = 23 },
66-
{ .center_freq = 5040, .hw_value = 24 },
67-
{ .center_freq = 5045, .hw_value = 25 },
68-
{ .center_freq = 5055, .hw_value = 26 },
69-
{ .center_freq = 5060, .hw_value = 27 },
70-
{ .center_freq = 5080, .hw_value = 28 },
71-
{ .center_freq = 5170, .hw_value = 29 },
72-
{ .center_freq = 5180, .hw_value = 30 },
73-
{ .center_freq = 5190, .hw_value = 31 },
74-
{ .center_freq = 5200, .hw_value = 32 },
75-
{ .center_freq = 5210, .hw_value = 33 },
76-
{ .center_freq = 5220, .hw_value = 34 },
77-
{ .center_freq = 5230, .hw_value = 35 },
78-
{ .center_freq = 5240, .hw_value = 36 },
79-
{ .center_freq = 5260, .hw_value = 37 },
80-
{ .center_freq = 5280, .hw_value = 38 },
81-
{ .center_freq = 5300, .hw_value = 39 },
82-
{ .center_freq = 5320, .hw_value = 40 },
83-
{ .center_freq = 5500, .hw_value = 41 },
84-
{ .center_freq = 5520, .hw_value = 42 },
85-
{ .center_freq = 5540, .hw_value = 43 },
86-
{ .center_freq = 5560, .hw_value = 44 },
87-
{ .center_freq = 5580, .hw_value = 45 },
88-
{ .center_freq = 5600, .hw_value = 46 },
89-
{ .center_freq = 5620, .hw_value = 47 },
90-
{ .center_freq = 5640, .hw_value = 48 },
91-
{ .center_freq = 5660, .hw_value = 49 },
92-
{ .center_freq = 5680, .hw_value = 50 },
93-
{ .center_freq = 5700, .hw_value = 51 },
94-
{ .center_freq = 5745, .hw_value = 52 },
95-
{ .center_freq = 5765, .hw_value = 53 },
96-
{ .center_freq = 5785, .hw_value = 54 },
97-
{ .center_freq = 5805, .hw_value = 55 },
98-
{ .center_freq = 5825, .hw_value = 56 }
99-
};
100-
10145
static struct ieee80211_supported_band vnt_supported_2ghz_band = {
10246
.channels = vnt_channels_2ghz,
10347
.n_channels = ARRAY_SIZE(vnt_channels_2ghz),
10448
.bitrates = vnt_rates_bg,
10549
.n_bitrates = ARRAY_SIZE(vnt_rates_bg),
10650
};
10751

108-
static struct ieee80211_supported_band vnt_supported_5ghz_band = {
109-
.channels = vnt_channels_5ghz,
110-
.n_channels = ARRAY_SIZE(vnt_channels_5ghz),
111-
.bitrates = vnt_rates_a,
112-
.n_bitrates = ARRAY_SIZE(vnt_rates_a),
113-
};
114-
11552
static void vnt_init_band(struct vnt_private *priv,
11653
struct ieee80211_supported_band *supported_band,
11754
enum nl80211_band band)
@@ -129,23 +66,7 @@ static void vnt_init_band(struct vnt_private *priv,
12966

13067
void vnt_init_bands(struct vnt_private *priv)
13168
{
132-
switch (priv->byRFType) {
133-
case RF_AIROHA7230:
134-
case RF_UW2452:
135-
case RF_NOTHING:
136-
default:
137-
vnt_init_band(priv, &vnt_supported_5ghz_band,
138-
NL80211_BAND_5GHZ);
139-
fallthrough;
140-
case RF_RFMD2959:
141-
case RF_AIROHA:
142-
case RF_AL2230S:
143-
case RF_UW2451:
144-
case RF_VT3226:
145-
vnt_init_band(priv, &vnt_supported_2ghz_band,
146-
NL80211_BAND_2GHZ);
147-
break;
148-
}
69+
vnt_init_band(priv, &vnt_supported_2ghz_band, NL80211_BAND_2GHZ);
14970
}
15071

15172
/**
@@ -179,10 +100,6 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch)
179100
* it is for better TX throughput
180101
*/
181102

182-
if (priv->byRFType == RF_AIROHA7230)
183-
RFbAL7230SelectChannelPostProcess(priv, priv->byCurrentCh,
184-
ch->hw_value);
185-
186103
priv->byCurrentCh = ch->hw_value;
187104
ret &= RFbSelectChannel(priv, priv->byRFType,
188105
ch->hw_value);

0 commit comments

Comments
 (0)