]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
rtl8187: Remove large delays
authorLarry Finger <Larry.Finger@lwfinger.net>
Fri, 31 Oct 2008 16:52:07 +0000 (09:52 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 10 Nov 2008 20:17:34 +0000 (15:17 -0500)
The rtl8187 driver contains 3 sleep statements that are longer than
a second. Testing has shown no bad effects when they are removed.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Tested-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Tested-by: Hin-Tak Leung <htl10@users.sourceforge.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rtl8187_dev.c
drivers/net/wireless/rtl8187_rtl8225.c

index 6260ed8ce12be08f2e4fbaf03cd391349bb6c144..b4927d08507e66b4d15d59002aba194b02095f20 100644 (file)
@@ -669,7 +669,7 @@ static int rtl8187b_init_hw(struct ieee80211_hw *dev)
        rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, 0x0480);
        rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, 0x2488);
        rtl818x_iowrite16(priv, &priv->map->RFPinsEnable, 0x1FFF);
-       msleep(1100);
+       msleep(100);
 
        priv->rf->init(dev);
 
index b999f87ed150d40ce468ab2f82ee16990491f410..85965e0ec75aee8e270ed494e52d7e579d090541 100644 (file)
@@ -862,10 +862,8 @@ static void rtl8225z2_b_rf_init(struct ieee80211_hw *dev)
        rtl8225_write(dev, 0x3, 0x080); msleep(1);
        rtl8225_write(dev, 0x5, 0x004); msleep(1);
        rtl8225_write(dev, 0x0, 0x0B7); msleep(1);
-       msleep(3000);
 
        rtl8225_write(dev, 0x2, 0xC4D); msleep(1);
-       msleep(2000);
 
        rtl8225_write(dev, 0x2, 0x44D); msleep(1);
        rtl8225_write(dev, 0x0, 0x2BF); msleep(1);