Commit 1ffba357 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: Remove unused byRFType in channel.c 



Remove byRFType that support 5GHz band.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/3724590188e72e8f531fe03c2821c5d3d08e2e29.1646512837.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d7e2d1e8

drivers/staging/vt6655/channel.c

+1 −84
Original line number Diff line number Diff line
@@ -25,17 +25,6 @@ static struct ieee80211_rate vnt_rates_bg[] = { 
	{ .bitrate = 540, .hw_value = RATE_54M },

};



static struct ieee80211_rate vnt_rates_a[] = {

	{ .bitrate = 60,  .hw_value = RATE_6M },

	{ .bitrate = 90,  .hw_value = RATE_9M },

	{ .bitrate = 120, .hw_value = RATE_12M },

	{ .bitrate = 180, .hw_value = RATE_18M },

	{ .bitrate = 240, .hw_value = RATE_24M },

	{ .bitrate = 360, .hw_value = RATE_36M },

	{ .bitrate = 480, .hw_value = RATE_48M },

	{ .bitrate = 540, .hw_value = RATE_54M },

};



static struct ieee80211_channel vnt_channels_2ghz[] = {

	{ .center_freq = 2412, .hw_value = 1 },

	{ .center_freq = 2417, .hw_value = 2 },
@@ -53,51 +42,6 @@ static struct ieee80211_channel vnt_channels_2ghz[] = { 
	{ .center_freq = 2484, .hw_value = 14 }

};



static struct ieee80211_channel vnt_channels_5ghz[] = {

	{ .center_freq = 4915, .hw_value = 15 },

	{ .center_freq = 4920, .hw_value = 16 },

	{ .center_freq = 4925, .hw_value = 17 },

	{ .center_freq = 4935, .hw_value = 18 },

	{ .center_freq = 4940, .hw_value = 19 },

	{ .center_freq = 4945, .hw_value = 20 },

	{ .center_freq = 4960, .hw_value = 21 },

	{ .center_freq = 4980, .hw_value = 22 },

	{ .center_freq = 5035, .hw_value = 23 },

	{ .center_freq = 5040, .hw_value = 24 },

	{ .center_freq = 5045, .hw_value = 25 },

	{ .center_freq = 5055, .hw_value = 26 },

	{ .center_freq = 5060, .hw_value = 27 },

	{ .center_freq = 5080, .hw_value = 28 },

	{ .center_freq = 5170, .hw_value = 29 },

	{ .center_freq = 5180, .hw_value = 30 },

	{ .center_freq = 5190, .hw_value = 31 },

	{ .center_freq = 5200, .hw_value = 32 },

	{ .center_freq = 5210, .hw_value = 33 },

	{ .center_freq = 5220, .hw_value = 34 },

	{ .center_freq = 5230, .hw_value = 35 },

	{ .center_freq = 5240, .hw_value = 36 },

	{ .center_freq = 5260, .hw_value = 37 },

	{ .center_freq = 5280, .hw_value = 38 },

	{ .center_freq = 5300, .hw_value = 39 },

	{ .center_freq = 5320, .hw_value = 40 },

	{ .center_freq = 5500, .hw_value = 41 },

	{ .center_freq = 5520, .hw_value = 42 },

	{ .center_freq = 5540, .hw_value = 43 },

	{ .center_freq = 5560, .hw_value = 44 },

	{ .center_freq = 5580, .hw_value = 45 },

	{ .center_freq = 5600, .hw_value = 46 },

	{ .center_freq = 5620, .hw_value = 47 },

	{ .center_freq = 5640, .hw_value = 48 },

	{ .center_freq = 5660, .hw_value = 49 },

	{ .center_freq = 5680, .hw_value = 50 },

	{ .center_freq = 5700, .hw_value = 51 },

	{ .center_freq = 5745, .hw_value = 52 },

	{ .center_freq = 5765, .hw_value = 53 },

	{ .center_freq = 5785, .hw_value = 54 },

	{ .center_freq = 5805, .hw_value = 55 },

	{ .center_freq = 5825, .hw_value = 56 }

};



static struct ieee80211_supported_band vnt_supported_2ghz_band = {

	.channels = vnt_channels_2ghz,

	.n_channels = ARRAY_SIZE(vnt_channels_2ghz),
@@ -105,13 +49,6 @@ static struct ieee80211_supported_band vnt_supported_2ghz_band = { 
	.n_bitrates = ARRAY_SIZE(vnt_rates_bg),

};



static struct ieee80211_supported_band vnt_supported_5ghz_band = {

	.channels = vnt_channels_5ghz,

	.n_channels = ARRAY_SIZE(vnt_channels_5ghz),

	.bitrates = vnt_rates_a,

	.n_bitrates = ARRAY_SIZE(vnt_rates_a),

};



static void vnt_init_band(struct vnt_private *priv,

			  struct ieee80211_supported_band *supported_band,

			  enum nl80211_band band)
@@ -129,23 +66,7 @@ static void vnt_init_band(struct vnt_private *priv, 


void vnt_init_bands(struct vnt_private *priv)

{

	switch (priv->byRFType) {

	case RF_AIROHA7230:

	case RF_UW2452:

	case RF_NOTHING:

	default:

		vnt_init_band(priv, &vnt_supported_5ghz_band,

			      NL80211_BAND_5GHZ);

		fallthrough;

	case RF_RFMD2959:

	case RF_AIROHA:

	case RF_AL2230S:

	case RF_UW2451:

	case RF_VT3226:

		vnt_init_band(priv, &vnt_supported_2ghz_band,

			      NL80211_BAND_2GHZ);

		break;

	}

	vnt_init_band(priv, &vnt_supported_2ghz_band, NL80211_BAND_2GHZ);

}



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

	 */



	if (priv->byRFType == RF_AIROHA7230)

		RFbAL7230SelectChannelPostProcess(priv, priv->byCurrentCh,

						  ch->hw_value);



	priv->byCurrentCh = ch->hw_value;

	ret &= RFbSelectChannel(priv, priv->byRFType,

				ch->hw_value);