Skip to content

Commit

Permalink
rtlwifi: rtl8192de: Replace loops calling udelay with single mdelay
Browse files Browse the repository at this point in the history
There are a number of loops to implement delays. These are replaced with
single calls to mdelay().

The need for a fix was noted by Andrew Morton <akpm@linux-foundation.org>.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Larry Finger authored and John W. Linville committed Jul 5, 2011
1 parent c2a7965 commit eb8b27a
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions drivers/net/wireless/rtlwifi/rtl8192de/phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ bool rtl92d_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
enum rf_content content,
enum radio_path rfpath)
{
int i, j;
int i;
u32 *radioa_array_table;
u32 *radiob_array_table;
u16 radioa_arraylen, radiob_arraylen;
Expand Down Expand Up @@ -974,13 +974,10 @@ bool rtl92d_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
mdelay(50);
} else if (radioa_array_table[i] == 0xfd) {
/* delay_ms(5); */
for (j = 0; j < 100; j++)
udelay(MAX_STALL_TIME);
mdelay(5);
} else if (radioa_array_table[i] == 0xfc) {
/* delay_ms(1); */
for (j = 0; j < 20; j++)
udelay(MAX_STALL_TIME);

mdelay(1);
} else if (radioa_array_table[i] == 0xfb) {
udelay(50);
} else if (radioa_array_table[i] == 0xfa) {
Expand All @@ -1004,12 +1001,10 @@ bool rtl92d_phy_config_rf_with_headerfile(struct ieee80211_hw *hw,
mdelay(50);
} else if (radiob_array_table[i] == 0xfd) {
/* delay_ms(5); */
for (j = 0; j < 100; j++)
udelay(MAX_STALL_TIME);
mdelay(5);
} else if (radiob_array_table[i] == 0xfc) {
/* delay_ms(1); */
for (j = 0; j < 20; j++)
udelay(MAX_STALL_TIME);
mdelay(1);
} else if (radiob_array_table[i] == 0xfb) {
udelay(50);
} else if (radiob_array_table[i] == 0xfa) {
Expand Down Expand Up @@ -1276,7 +1271,7 @@ static void rtl92d_phy_switch_wirelessband(struct ieee80211_hw *hw, u8 band)
{
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
u8 i, value8;
u8 value8;

RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("==>\n"));
rtlhal->bandset = band;
Expand Down Expand Up @@ -1321,8 +1316,7 @@ static void rtl92d_phy_switch_wirelessband(struct ieee80211_hw *hw, u8 band)
rtl_write_byte(rtlpriv, (rtlhal->interfaceindex ==
0 ? REG_MAC0 : REG_MAC1), value8);
}
for (i = 0; i < 20; i++)
udelay(MAX_STALL_TIME);
mdelay(1);
RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, ("<==Switch Band OK.\n"));
}

Expand Down

0 comments on commit eb8b27a

Please sign in to comment.