diff options
author | Willy Tarreau <w@1wt.eu> | 2011-02-20 05:43:36 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-02-23 16:25:30 -0500 |
commit | 8c6113cd03c7e927f5ee5f6ad98e155ef2d27177 (patch) | |
tree | 260a16afe65a6e6b3bea06f4431abf6d0f387122 | |
parent | 892c05c093858086d808aeb366b2e11106dd96c6 (diff) |
rtlwifi: Eliminate udelay calls with too large values
On ARM, compilation of rtlwifi/efuse.c fails with the message:
ERROR: "__bad_udelay" [drivers/net/wireless/rtlwifi/rtlwifi.ko] undefined!
On inspection, the faulty calls are in routine efuse_reset_loader(), a
routine that is never used, and the faulty routine is deleted.
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/rtlwifi/efuse.c | 18 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/efuse.h | 3 |
2 files changed, 0 insertions, 21 deletions
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c index 62876cd5c41a..4f92cba6810a 100644 --- a/drivers/net/wireless/rtlwifi/efuse.c +++ b/drivers/net/wireless/rtlwifi/efuse.c | |||
@@ -1169,21 +1169,3 @@ static u8 efuse_calculate_word_cnts(u8 word_en) | |||
1169 | return word_cnts; | 1169 | return word_cnts; |
1170 | } | 1170 | } |
1171 | 1171 | ||
1172 | void efuse_reset_loader(struct ieee80211_hw *hw) | ||
1173 | { | ||
1174 | struct rtl_priv *rtlpriv = rtl_priv(hw); | ||
1175 | u16 tmp_u2b; | ||
1176 | |||
1177 | tmp_u2b = rtl_read_word(rtlpriv, rtlpriv->cfg->maps[SYS_FUNC_EN]); | ||
1178 | rtl_write_word(rtlpriv, rtlpriv->cfg->maps[SYS_FUNC_EN], | ||
1179 | (tmp_u2b & ~(BIT(12)))); | ||
1180 | udelay(10000); | ||
1181 | rtl_write_word(rtlpriv, rtlpriv->cfg->maps[SYS_FUNC_EN], | ||
1182 | (tmp_u2b | BIT(12))); | ||
1183 | udelay(10000); | ||
1184 | } | ||
1185 | |||
1186 | bool efuse_program_map(struct ieee80211_hw *hw, char *p_filename, u8 tabletype) | ||
1187 | { | ||
1188 | return true; | ||
1189 | } | ||
diff --git a/drivers/net/wireless/rtlwifi/efuse.h b/drivers/net/wireless/rtlwifi/efuse.h index 2d39a4df181b..47774dd4c2a6 100644 --- a/drivers/net/wireless/rtlwifi/efuse.h +++ b/drivers/net/wireless/rtlwifi/efuse.h | |||
@@ -117,8 +117,5 @@ extern bool efuse_shadow_update_chk(struct ieee80211_hw *hw); | |||
117 | extern void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw); | 117 | extern void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw); |
118 | extern void efuse_force_write_vendor_Id(struct ieee80211_hw *hw); | 118 | extern void efuse_force_write_vendor_Id(struct ieee80211_hw *hw); |
119 | extern void efuse_re_pg_section(struct ieee80211_hw *hw, u8 section_idx); | 119 | extern void efuse_re_pg_section(struct ieee80211_hw *hw, u8 section_idx); |
120 | extern bool efuse_program_map(struct ieee80211_hw *hw, | ||
121 | char *p_filename, u8 tabletype); | ||
122 | extern void efuse_reset_loader(struct ieee80211_hw *hw); | ||
123 | 120 | ||
124 | #endif | 121 | #endif |