diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2008-10-31 12:52:07 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-11-10 15:17:34 -0500 |
commit | 2f20596b50ee964715f9ad44d848802f0baba5d8 (patch) | |
tree | 4a2834e7b3d13611fe7720313a8fe69e70c9bb21 | |
parent | 9344e86e577df483475845096dba07f2deb11ce3 (diff) |
rtl8187: Remove large delays
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>
-rw-r--r-- | drivers/net/wireless/rtl8187_dev.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtl8187_rtl8225.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c index 6260ed8ce12b..b4927d08507e 100644 --- a/drivers/net/wireless/rtl8187_dev.c +++ b/drivers/net/wireless/rtl8187_dev.c | |||
@@ -669,7 +669,7 @@ static int rtl8187b_init_hw(struct ieee80211_hw *dev) | |||
669 | rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, 0x0480); | 669 | rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, 0x0480); |
670 | rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, 0x2488); | 670 | rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, 0x2488); |
671 | rtl818x_iowrite16(priv, &priv->map->RFPinsEnable, 0x1FFF); | 671 | rtl818x_iowrite16(priv, &priv->map->RFPinsEnable, 0x1FFF); |
672 | msleep(1100); | 672 | msleep(100); |
673 | 673 | ||
674 | priv->rf->init(dev); | 674 | priv->rf->init(dev); |
675 | 675 | ||
diff --git a/drivers/net/wireless/rtl8187_rtl8225.c b/drivers/net/wireless/rtl8187_rtl8225.c index b999f87ed150..85965e0ec75a 100644 --- a/drivers/net/wireless/rtl8187_rtl8225.c +++ b/drivers/net/wireless/rtl8187_rtl8225.c | |||
@@ -862,10 +862,8 @@ static void rtl8225z2_b_rf_init(struct ieee80211_hw *dev) | |||
862 | rtl8225_write(dev, 0x3, 0x080); msleep(1); | 862 | rtl8225_write(dev, 0x3, 0x080); msleep(1); |
863 | rtl8225_write(dev, 0x5, 0x004); msleep(1); | 863 | rtl8225_write(dev, 0x5, 0x004); msleep(1); |
864 | rtl8225_write(dev, 0x0, 0x0B7); msleep(1); | 864 | rtl8225_write(dev, 0x0, 0x0B7); msleep(1); |
865 | msleep(3000); | ||
866 | 865 | ||
867 | rtl8225_write(dev, 0x2, 0xC4D); msleep(1); | 866 | rtl8225_write(dev, 0x2, 0xC4D); msleep(1); |
868 | msleep(2000); | ||
869 | 867 | ||
870 | rtl8225_write(dev, 0x2, 0x44D); msleep(1); | 868 | rtl8225_write(dev, 0x2, 0x44D); msleep(1); |
871 | rtl8225_write(dev, 0x0, 0x2BF); msleep(1); | 869 | rtl8225_write(dev, 0x0, 0x2BF); msleep(1); |