Skip to content

Commit c933388

Browse files
Philipp Hortmanngregkh
authored andcommitted
staging: vt6656: Remove unused rf_type in channel.c
Remove rf_type that supports 5GHz band. Signed-off-by: Philipp Hortmann <[email protected]> Link: https://lore.kernel.org/r/99af8605af8d348c6b60553c54149ad55da0e3b6.1646935331.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 6413489 commit c933388

File tree

1 file changed

+6
-90
lines changed

1 file changed

+6
-90
lines changed

drivers/staging/vt6656/channel.c

Lines changed: 6 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,6 @@ static struct ieee80211_rate vnt_rates_bg[] = {
3838
{ .bitrate = 540, .hw_value = RATE_54M },
3939
};
4040

41-
static struct ieee80211_rate vnt_rates_a[] = {
42-
{ .bitrate = 60, .hw_value = RATE_6M },
43-
{ .bitrate = 90, .hw_value = RATE_9M },
44-
{ .bitrate = 120, .hw_value = RATE_12M },
45-
{ .bitrate = 180, .hw_value = RATE_18M },
46-
{ .bitrate = 240, .hw_value = RATE_24M },
47-
{ .bitrate = 360, .hw_value = RATE_36M },
48-
{ .bitrate = 480, .hw_value = RATE_48M },
49-
{ .bitrate = 540, .hw_value = RATE_54M },
50-
};
51-
5241
static struct ieee80211_channel vnt_channels_2ghz[] = {
5342
{ .center_freq = 2412, .hw_value = 1 },
5443
{ .center_freq = 2417, .hw_value = 2 },
@@ -66,50 +55,6 @@ static struct ieee80211_channel vnt_channels_2ghz[] = {
6655
{ .center_freq = 2484, .hw_value = 14 }
6756
};
6857

69-
static struct ieee80211_channel vnt_channels_5ghz[] = {
70-
{ .center_freq = 4915, .hw_value = 15 },
71-
{ .center_freq = 4920, .hw_value = 16 },
72-
{ .center_freq = 4925, .hw_value = 17 },
73-
{ .center_freq = 4935, .hw_value = 18 },
74-
{ .center_freq = 4940, .hw_value = 19 },
75-
{ .center_freq = 4945, .hw_value = 20 },
76-
{ .center_freq = 4960, .hw_value = 21 },
77-
{ .center_freq = 4980, .hw_value = 22 },
78-
{ .center_freq = 5035, .hw_value = 23 },
79-
{ .center_freq = 5040, .hw_value = 24 },
80-
{ .center_freq = 5045, .hw_value = 25 },
81-
{ .center_freq = 5055, .hw_value = 26 },
82-
{ .center_freq = 5060, .hw_value = 27 },
83-
{ .center_freq = 5080, .hw_value = 28 },
84-
{ .center_freq = 5170, .hw_value = 29 },
85-
{ .center_freq = 5180, .hw_value = 30 },
86-
{ .center_freq = 5190, .hw_value = 31 },
87-
{ .center_freq = 5200, .hw_value = 32 },
88-
{ .center_freq = 5210, .hw_value = 33 },
89-
{ .center_freq = 5220, .hw_value = 34 },
90-
{ .center_freq = 5230, .hw_value = 35 },
91-
{ .center_freq = 5240, .hw_value = 36 },
92-
{ .center_freq = 5260, .hw_value = 37 },
93-
{ .center_freq = 5280, .hw_value = 38 },
94-
{ .center_freq = 5300, .hw_value = 39 },
95-
{ .center_freq = 5320, .hw_value = 40 },
96-
{ .center_freq = 5500, .hw_value = 41 },
97-
{ .center_freq = 5520, .hw_value = 42 },
98-
{ .center_freq = 5540, .hw_value = 43 },
99-
{ .center_freq = 5560, .hw_value = 44 },
100-
{ .center_freq = 5580, .hw_value = 45 },
101-
{ .center_freq = 5600, .hw_value = 46 },
102-
{ .center_freq = 5620, .hw_value = 47 },
103-
{ .center_freq = 5640, .hw_value = 48 },
104-
{ .center_freq = 5660, .hw_value = 49 },
105-
{ .center_freq = 5680, .hw_value = 50 },
106-
{ .center_freq = 5700, .hw_value = 51 },
107-
{ .center_freq = 5745, .hw_value = 52 },
108-
{ .center_freq = 5765, .hw_value = 53 },
109-
{ .center_freq = 5785, .hw_value = 54 },
110-
{ .center_freq = 5805, .hw_value = 55 },
111-
{ .center_freq = 5825, .hw_value = 56 }
112-
};
11358

11459
static struct ieee80211_supported_band vnt_supported_2ghz_band = {
11560
.channels = vnt_channels_2ghz,
@@ -118,45 +63,16 @@ static struct ieee80211_supported_band vnt_supported_2ghz_band = {
11863
.n_bitrates = ARRAY_SIZE(vnt_rates_bg),
11964
};
12065

121-
static struct ieee80211_supported_band vnt_supported_5ghz_band = {
122-
.channels = vnt_channels_5ghz,
123-
.n_channels = ARRAY_SIZE(vnt_channels_5ghz),
124-
.bitrates = vnt_rates_a,
125-
.n_bitrates = ARRAY_SIZE(vnt_rates_a),
126-
};
127-
12866
void vnt_init_bands(struct vnt_private *priv)
12967
{
13068
struct ieee80211_channel *ch;
13169
int i;
13270

133-
switch (priv->rf_type) {
134-
case RF_AIROHA7230:
135-
case RF_VT3342A0:
136-
default:
137-
ch = vnt_channels_5ghz;
138-
139-
for (i = 0; i < ARRAY_SIZE(vnt_channels_5ghz); i++) {
140-
ch[i].max_power = VNT_RF_MAX_POWER;
141-
ch[i].flags = IEEE80211_CHAN_NO_HT40;
142-
}
143-
144-
priv->hw->wiphy->bands[NL80211_BAND_5GHZ] =
145-
&vnt_supported_5ghz_band;
146-
fallthrough;
147-
case RF_AL2230:
148-
case RF_AL2230S:
149-
case RF_VT3226:
150-
case RF_VT3226D0:
151-
ch = vnt_channels_2ghz;
152-
153-
for (i = 0; i < ARRAY_SIZE(vnt_channels_2ghz); i++) {
154-
ch[i].max_power = VNT_RF_MAX_POWER;
155-
ch[i].flags = IEEE80211_CHAN_NO_HT40;
156-
}
157-
158-
priv->hw->wiphy->bands[NL80211_BAND_2GHZ] =
159-
&vnt_supported_2ghz_band;
160-
break;
71+
ch = vnt_channels_2ghz;
72+
for (i = 0; i < ARRAY_SIZE(vnt_channels_2ghz); i++) {
73+
ch[i].max_power = VNT_RF_MAX_POWER;
74+
ch[i].flags = IEEE80211_CHAN_NO_HT40;
16175
}
76+
priv->hw->wiphy->bands[NL80211_BAND_2GHZ] =
77+
&vnt_supported_2ghz_band;
16278
}

0 commit comments

Comments
 (0)