diff options
author | Daniel Thompson <daniel.thompson@linaro.org> | 2017-08-03 08:27:47 +0100 |
---|---|---|
committer | Daniel Thompson <daniel.thompson@linaro.org> | 2017-08-03 08:27:47 +0100 |
commit | b476a2c5bfb893aba3ee4daa840196a97898bf48 (patch) | |
tree | 1dd947d64ae04bdd8e7097a9b854bf1dfbff80e9 | |
parent | df67fda2ef41adc302f8fd1cea51224386d1e624 (diff) |
net: wireless: rdaw80211: Disable unused tablesrda/hacking
This causes problems with -Werror with more recent compilers. This
is the minimal change needed to get a successful compile using gcc 7.
Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>
3 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/rdaw80211/rdacombodev/rda_5991e_power_ctrl.c b/drivers/net/wireless/rdaw80211/rdacombodev/rda_5991e_power_ctrl.c index e528388e9e73..d7ef0be888c8 100644 --- a/drivers/net/wireless/rdaw80211/rdacombodev/rda_5991e_power_ctrl.c +++ b/drivers/net/wireless/rdaw80211/rdacombodev/rda_5991e_power_ctrl.c @@ -102,9 +102,11 @@ static const u16 wf_rf_setting_5991e[][2] = { }; #endif +#if 0 static const u16 wf_agc_setting_for_dccal_5991e[][2] = { }; +#endif static const u16 wf_agc_setting_5991e[][2] = { {0x3F, 0x0000}, @@ -271,12 +273,14 @@ static const u16 rda_5991e_bt_no_force_swtrx[][2] = +#if 0 static const u16 bt_dc_cal_5991e[][2] = { {0x3F, 0x0000}, {0x30, 0x0140}, {0x30, 0x0141}, DELAY_MS(50) }; +#endif #endif diff --git a/drivers/net/wireless/rdaw80211/rdacombodev/rda_5991f_power_ctrl.c b/drivers/net/wireless/rdaw80211/rdacombodev/rda_5991f_power_ctrl.c index 3f7be4c3e421..be991202e68c 100644 --- a/drivers/net/wireless/rdaw80211/rdacombodev/rda_5991f_power_ctrl.c +++ b/drivers/net/wireless/rdaw80211/rdacombodev/rda_5991f_power_ctrl.c @@ -105,9 +105,11 @@ static const u16 wf_rf_setting_5991f[][2] = { }; #endif +#if 0 static const u16 wf_agc_setting_for_dccal_5991f[][2] = { }; +#endif static const u16 wf_agc_setting_5991f[][2] = { {0x3F, 0x0000}, @@ -252,6 +254,7 @@ static const u16 rda_5991f_bt_no_force_swtrx[][2] = +#if 0 static const u16 bt_dc_cal_5991f[][2] = { {0x3F, 0x0000}, {0x30, 0x0140}, @@ -259,6 +262,7 @@ static const u16 bt_dc_cal_5991f[][2] = { DELAY_MS(50) }; #endif +#endif static int check_wifi_power_on(void) { diff --git a/drivers/net/wireless/rdaw80211/rdacombodev/rda_5991g_power_ctrl.c b/drivers/net/wireless/rdaw80211/rdacombodev/rda_5991g_power_ctrl.c index 26c8eda29e99..086c3a9ae066 100644 --- a/drivers/net/wireless/rdaw80211/rdacombodev/rda_5991g_power_ctrl.c +++ b/drivers/net/wireless/rdaw80211/rdacombodev/rda_5991g_power_ctrl.c @@ -150,9 +150,11 @@ static const u16 wf_rf_setting_5991g[][2] = { }; #endif +#if 0 static const u16 wf_agc_setting_for_dccal_5991g[][2] = { }; +#endif static const u16 wf_agc_setting_5991g[][2] = { {0x3F, 0x0000}, @@ -324,6 +326,7 @@ static const u16 rda_5991g_bt_no_force_swtrx[][2] = +#if 0 static const u16 bt_dc_cal_5991g[][2] = { {0x3F, 0x0000}, {0x30, 0x0140}, @@ -331,6 +334,7 @@ static const u16 bt_dc_cal_5991g[][2] = { DELAY_MS(50) }; #endif +#endif static int check_wifi_power_on(void) { |