58 lines
2.2 KiB
Diff
58 lines
2.2 KiB
Diff
From: Willy Tarreau <w@1wt.eu>
|
|
Date: Sun, 20 Feb 2011 10:43:36 +0000 (+0100)
|
|
Subject: rtlwifi: Eliminate udelay calls with too large values
|
|
X-Git-Tag: v2.6.39-rc1~468^2~25^2^2~104
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=8c6113cd03c7e927f5ee5f6ad98e155ef2d27177
|
|
|
|
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>
|
|
---
|
|
|
|
diff --git a/drivers/net/wireless/rtlwifi/efuse.c b/drivers/net/wireless/rtlwifi/efuse.c
|
|
index 62876cd..4f92cba 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)
|
|
return word_cnts;
|
|
}
|
|
|
|
-void efuse_reset_loader(struct ieee80211_hw *hw)
|
|
-{
|
|
- struct rtl_priv *rtlpriv = rtl_priv(hw);
|
|
- u16 tmp_u2b;
|
|
-
|
|
- tmp_u2b = rtl_read_word(rtlpriv, rtlpriv->cfg->maps[SYS_FUNC_EN]);
|
|
- rtl_write_word(rtlpriv, rtlpriv->cfg->maps[SYS_FUNC_EN],
|
|
- (tmp_u2b & ~(BIT(12))));
|
|
- udelay(10000);
|
|
- rtl_write_word(rtlpriv, rtlpriv->cfg->maps[SYS_FUNC_EN],
|
|
- (tmp_u2b | BIT(12)));
|
|
- udelay(10000);
|
|
-}
|
|
-
|
|
-bool efuse_program_map(struct ieee80211_hw *hw, char *p_filename, u8 tabletype)
|
|
-{
|
|
- return true;
|
|
-}
|
|
diff --git a/drivers/net/wireless/rtlwifi/efuse.h b/drivers/net/wireless/rtlwifi/efuse.h
|
|
index 2d39a4d..47774dd 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);
|
|
extern void rtl_efuse_shadow_map_update(struct ieee80211_hw *hw);
|
|
extern void efuse_force_write_vendor_Id(struct ieee80211_hw *hw);
|
|
extern void efuse_re_pg_section(struct ieee80211_hw *hw, u8 section_idx);
|
|
-extern bool efuse_program_map(struct ieee80211_hw *hw,
|
|
- char *p_filename, u8 tabletype);
|
|
-extern void efuse_reset_loader(struct ieee80211_hw *hw);
|
|
|
|
#endif
|