Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

1 files changed, 188 insertions, 195 deletions

diff --git a/drivers/net/wireless/rtl8187_rtl8225.c b/drivers/net/wireless/rtl8187_rtl8225.c
index b999f87ed150..69030be62b36 100644
--- a/drivers/net/wireless/rtl8187_rtl8225.c
+++ b/drivers/net/wireless/rtl8187_rtl8225.c
@@ -64,7 +64,6 @@ static void rtl8225_write_bitbang(struct ieee80211_hw *dev, u8 addr, u16 data)
 
         rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg80 | (1 << 2));
         rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, reg84);
-        msleep(2);
 }
 
 static void rtl8225_write_8051(struct ieee80211_hw *dev, u8 addr, __le16 data)
@@ -98,7 +97,6 @@ static void rtl8225_write_8051(struct ieee80211_hw *dev, u8 addr, __le16 data)
 
         rtl818x_iowrite16(priv, &priv->map->RFPinsOutput, reg80 | (1 << 2));
         rtl818x_iowrite16(priv, &priv->map->RFPinsSelect, reg84);
-        msleep(2);
 }
 
 static void rtl8225_write(struct ieee80211_hw *dev, u8 addr, u16 data)
@@ -333,21 +331,21 @@ static void rtl8225_rf_init(struct ieee80211_hw *dev)
         struct rtl8187_priv *priv = dev->priv;
         int i;
 
-        rtl8225_write(dev, 0x0, 0x067); msleep(1);
-        rtl8225_write(dev, 0x1, 0xFE0); msleep(1);
-        rtl8225_write(dev, 0x2, 0x44D); msleep(1);
-        rtl8225_write(dev, 0x3, 0x441); msleep(1);
-        rtl8225_write(dev, 0x4, 0x486); msleep(1);
-        rtl8225_write(dev, 0x5, 0xBC0); msleep(1);
-        rtl8225_write(dev, 0x6, 0xAE6); msleep(1);
-        rtl8225_write(dev, 0x7, 0x82A); msleep(1);
-        rtl8225_write(dev, 0x8, 0x01F); msleep(1);
-        rtl8225_write(dev, 0x9, 0x334); msleep(1);
-        rtl8225_write(dev, 0xA, 0xFD4); msleep(1);
-        rtl8225_write(dev, 0xB, 0x391); msleep(1);
-        rtl8225_write(dev, 0xC, 0x050); msleep(1);
-        rtl8225_write(dev, 0xD, 0x6DB); msleep(1);
-        rtl8225_write(dev, 0xE, 0x029); msleep(1);
+        rtl8225_write(dev, 0x0, 0x067);
+        rtl8225_write(dev, 0x1, 0xFE0);
+        rtl8225_write(dev, 0x2, 0x44D);
+        rtl8225_write(dev, 0x3, 0x441);
+        rtl8225_write(dev, 0x4, 0x486);
+        rtl8225_write(dev, 0x5, 0xBC0);
+        rtl8225_write(dev, 0x6, 0xAE6);
+        rtl8225_write(dev, 0x7, 0x82A);
+        rtl8225_write(dev, 0x8, 0x01F);
+        rtl8225_write(dev, 0x9, 0x334);
+        rtl8225_write(dev, 0xA, 0xFD4);
+        rtl8225_write(dev, 0xB, 0x391);
+        rtl8225_write(dev, 0xC, 0x050);
+        rtl8225_write(dev, 0xD, 0x6DB);
+        rtl8225_write(dev, 0xE, 0x029);
         rtl8225_write(dev, 0xF, 0x914); msleep(100);
 
         rtl8225_write(dev, 0x2, 0xC4D); msleep(200);
@@ -375,91 +373,89 @@ static void rtl8225_rf_init(struct ieee80211_hw *dev)
 
         for (i = 0; i < ARRAY_SIZE(rtl8225_agc); i++) {
                 rtl8225_write_phy_ofdm(dev, 0xB, rtl8225_agc[i]);
-                msleep(1);
                 rtl8225_write_phy_ofdm(dev, 0xA, 0x80 + i);
-                msleep(1);
         }
 
         msleep(1);
 
-        rtl8225_write_phy_ofdm(dev, 0x00, 0x01); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x01, 0x02); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x02, 0x42); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x03, 0x00); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x04, 0x00); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x05, 0x00); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x06, 0x40); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x07, 0x00); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x08, 0x40); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x09, 0xfe); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x0a, 0x09); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x0b, 0x80); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x0c, 0x01); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x0e, 0xd3); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x0f, 0x38); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x10, 0x84); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x11, 0x06); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x12, 0x20); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x13, 0x20); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x14, 0x00); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x15, 0x40); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x16, 0x00); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x17, 0x40); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x18, 0xef); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x19, 0x19); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x1a, 0x20); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x1b, 0x76); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x1c, 0x04); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x1e, 0x95); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x1f, 0x75); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x20, 0x1f); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x21, 0x27); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x22, 0x16); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x24, 0x46); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x25, 0x20); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x26, 0x90); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x27, 0x88); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x00, 0x01);
+        rtl8225_write_phy_ofdm(dev, 0x01, 0x02);
+        rtl8225_write_phy_ofdm(dev, 0x02, 0x42);
+        rtl8225_write_phy_ofdm(dev, 0x03, 0x00);
+        rtl8225_write_phy_ofdm(dev, 0x04, 0x00);
+        rtl8225_write_phy_ofdm(dev, 0x05, 0x00);
+        rtl8225_write_phy_ofdm(dev, 0x06, 0x40);
+        rtl8225_write_phy_ofdm(dev, 0x07, 0x00);
+        rtl8225_write_phy_ofdm(dev, 0x08, 0x40);
+        rtl8225_write_phy_ofdm(dev, 0x09, 0xfe);
+        rtl8225_write_phy_ofdm(dev, 0x0a, 0x09);
+        rtl8225_write_phy_ofdm(dev, 0x0b, 0x80);
+        rtl8225_write_phy_ofdm(dev, 0x0c, 0x01);
+        rtl8225_write_phy_ofdm(dev, 0x0e, 0xd3);
+        rtl8225_write_phy_ofdm(dev, 0x0f, 0x38);
+        rtl8225_write_phy_ofdm(dev, 0x10, 0x84);
+        rtl8225_write_phy_ofdm(dev, 0x11, 0x06);
+        rtl8225_write_phy_ofdm(dev, 0x12, 0x20);
+        rtl8225_write_phy_ofdm(dev, 0x13, 0x20);
+        rtl8225_write_phy_ofdm(dev, 0x14, 0x00);
+        rtl8225_write_phy_ofdm(dev, 0x15, 0x40);
+        rtl8225_write_phy_ofdm(dev, 0x16, 0x00);
+        rtl8225_write_phy_ofdm(dev, 0x17, 0x40);
+        rtl8225_write_phy_ofdm(dev, 0x18, 0xef);
+        rtl8225_write_phy_ofdm(dev, 0x19, 0x19);
+        rtl8225_write_phy_ofdm(dev, 0x1a, 0x20);
+        rtl8225_write_phy_ofdm(dev, 0x1b, 0x76);
+        rtl8225_write_phy_ofdm(dev, 0x1c, 0x04);
+        rtl8225_write_phy_ofdm(dev, 0x1e, 0x95);
+        rtl8225_write_phy_ofdm(dev, 0x1f, 0x75);
+        rtl8225_write_phy_ofdm(dev, 0x20, 0x1f);
+        rtl8225_write_phy_ofdm(dev, 0x21, 0x27);
+        rtl8225_write_phy_ofdm(dev, 0x22, 0x16);
+        rtl8225_write_phy_ofdm(dev, 0x24, 0x46);
+        rtl8225_write_phy_ofdm(dev, 0x25, 0x20);
+        rtl8225_write_phy_ofdm(dev, 0x26, 0x90);
+        rtl8225_write_phy_ofdm(dev, 0x27, 0x88);
 
         rtl8225_write_phy_ofdm(dev, 0x0d, rtl8225_gain[2 * 4]);
         rtl8225_write_phy_ofdm(dev, 0x1b, rtl8225_gain[2 * 4 + 2]);
         rtl8225_write_phy_ofdm(dev, 0x1d, rtl8225_gain[2 * 4 + 3]);
         rtl8225_write_phy_ofdm(dev, 0x23, rtl8225_gain[2 * 4 + 1]);
 
-        rtl8225_write_phy_cck(dev, 0x00, 0x98); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x03, 0x20); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x04, 0x7e); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x05, 0x12); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x06, 0xfc); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x07, 0x78); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x08, 0x2e); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x10, 0x9b); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x11, 0x88); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x12, 0x47); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x00, 0x98);
+        rtl8225_write_phy_cck(dev, 0x03, 0x20);
+        rtl8225_write_phy_cck(dev, 0x04, 0x7e);
+        rtl8225_write_phy_cck(dev, 0x05, 0x12);
+        rtl8225_write_phy_cck(dev, 0x06, 0xfc);
+        rtl8225_write_phy_cck(dev, 0x07, 0x78);
+        rtl8225_write_phy_cck(dev, 0x08, 0x2e);
+        rtl8225_write_phy_cck(dev, 0x10, 0x9b);
+        rtl8225_write_phy_cck(dev, 0x11, 0x88);
+        rtl8225_write_phy_cck(dev, 0x12, 0x47);
         rtl8225_write_phy_cck(dev, 0x13, 0xd0);
         rtl8225_write_phy_cck(dev, 0x19, 0x00);
         rtl8225_write_phy_cck(dev, 0x1a, 0xa0);
         rtl8225_write_phy_cck(dev, 0x1b, 0x08);
         rtl8225_write_phy_cck(dev, 0x40, 0x86);
-        rtl8225_write_phy_cck(dev, 0x41, 0x8d); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x42, 0x15); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x43, 0x18); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x44, 0x1f); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x45, 0x1e); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x46, 0x1a); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x47, 0x15); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x48, 0x10); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x49, 0x0a); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x4a, 0x05); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x4b, 0x02); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x4c, 0x05); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x41, 0x8d);
+        rtl8225_write_phy_cck(dev, 0x42, 0x15);
+        rtl8225_write_phy_cck(dev, 0x43, 0x18);
+        rtl8225_write_phy_cck(dev, 0x44, 0x1f);
+        rtl8225_write_phy_cck(dev, 0x45, 0x1e);
+        rtl8225_write_phy_cck(dev, 0x46, 0x1a);
+        rtl8225_write_phy_cck(dev, 0x47, 0x15);
+        rtl8225_write_phy_cck(dev, 0x48, 0x10);
+        rtl8225_write_phy_cck(dev, 0x49, 0x0a);
+        rtl8225_write_phy_cck(dev, 0x4a, 0x05);
+        rtl8225_write_phy_cck(dev, 0x4b, 0x02);
+        rtl8225_write_phy_cck(dev, 0x4c, 0x05);
 
         rtl818x_iowrite8(priv, &priv->map->TESTR, 0x0D);
 
         rtl8225_rf_set_tx_power(dev, 1);
 
         /* RX antenna default to A */
-        rtl8225_write_phy_cck(dev, 0x10, 0x9b); msleep(1);      /* B: 0xDB */
-        rtl8225_write_phy_ofdm(dev, 0x26, 0x90); msleep(1);     /* B: 0x10 */
+        rtl8225_write_phy_cck(dev, 0x10, 0x9b);                 /* B: 0xDB */
+        rtl8225_write_phy_ofdm(dev, 0x26, 0x90);                /* B: 0x10 */
 
         rtl818x_iowrite8(priv, &priv->map->TX_ANTENNA, 0x03);   /* B: 0x00 */
         msleep(1);
@@ -629,7 +625,7 @@ static void rtl8225z2_b_rf_set_tx_power(struct ieee80211_hw *dev, int channel)
                 rtl8225_write_phy_cck(dev, 0x44 + i, *tmp++);
 
         rtl818x_iowrite8(priv, &priv->map->TX_GAIN_CCK,
-                         rtl8225z2_tx_gain_cck_ofdm[cck_power]);
+                         rtl8225z2_tx_gain_cck_ofdm[cck_power] << 1);
         msleep(1);
 
         rtl818x_iowrite8(priv, &priv->map->TX_GAIN_OFDM,
@@ -687,22 +683,23 @@ static void rtl8225z2_rf_init(struct ieee80211_hw *dev)
         struct rtl8187_priv *priv = dev->priv;
         int i;
 
-        rtl8225_write(dev, 0x0, 0x2BF); msleep(1);
-        rtl8225_write(dev, 0x1, 0xEE0); msleep(1);
-        rtl8225_write(dev, 0x2, 0x44D); msleep(1);
-        rtl8225_write(dev, 0x3, 0x441); msleep(1);
-        rtl8225_write(dev, 0x4, 0x8C3); msleep(1);
-        rtl8225_write(dev, 0x5, 0xC72); msleep(1);
-        rtl8225_write(dev, 0x6, 0x0E6); msleep(1);
-        rtl8225_write(dev, 0x7, 0x82A); msleep(1);
-        rtl8225_write(dev, 0x8, 0x03F); msleep(1);
-        rtl8225_write(dev, 0x9, 0x335); msleep(1);
-        rtl8225_write(dev, 0xa, 0x9D4); msleep(1);
-        rtl8225_write(dev, 0xb, 0x7BB); msleep(1);
-        rtl8225_write(dev, 0xc, 0x850); msleep(1);
-        rtl8225_write(dev, 0xd, 0xCDF); msleep(1);
-        rtl8225_write(dev, 0xe, 0x02B); msleep(1);
-        rtl8225_write(dev, 0xf, 0x114); msleep(100);
+        rtl8225_write(dev, 0x0, 0x2BF);
+        rtl8225_write(dev, 0x1, 0xEE0);
+        rtl8225_write(dev, 0x2, 0x44D);
+        rtl8225_write(dev, 0x3, 0x441);
+        rtl8225_write(dev, 0x4, 0x8C3);
+        rtl8225_write(dev, 0x5, 0xC72);
+        rtl8225_write(dev, 0x6, 0x0E6);
+        rtl8225_write(dev, 0x7, 0x82A);
+        rtl8225_write(dev, 0x8, 0x03F);
+        rtl8225_write(dev, 0x9, 0x335);
+        rtl8225_write(dev, 0xa, 0x9D4);
+        rtl8225_write(dev, 0xb, 0x7BB);
+        rtl8225_write(dev, 0xc, 0x850);
+        rtl8225_write(dev, 0xd, 0xCDF);
+        rtl8225_write(dev, 0xe, 0x02B);
+        rtl8225_write(dev, 0xf, 0x114);
+        msleep(100);
 
         rtl8225_write(dev, 0x0, 0x1B7);
 
@@ -736,94 +733,92 @@ static void rtl8225z2_rf_init(struct ieee80211_hw *dev)
 
         for (i = 0; i < ARRAY_SIZE(rtl8225_agc); i++) {
                 rtl8225_write_phy_ofdm(dev, 0xB, rtl8225_agc[i]);
-                msleep(1);
                 rtl8225_write_phy_ofdm(dev, 0xA, 0x80 + i);
-                msleep(1);
         }
 
         msleep(1);
 
-        rtl8225_write_phy_ofdm(dev, 0x00, 0x01); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x01, 0x02); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x02, 0x42); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x03, 0x00); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x04, 0x00); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x05, 0x00); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x06, 0x40); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x07, 0x00); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x08, 0x40); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x09, 0xfe); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x0a, 0x08); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x0b, 0x80); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x0c, 0x01); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x00, 0x01);
+        rtl8225_write_phy_ofdm(dev, 0x01, 0x02);
+        rtl8225_write_phy_ofdm(dev, 0x02, 0x42);
+        rtl8225_write_phy_ofdm(dev, 0x03, 0x00);
+        rtl8225_write_phy_ofdm(dev, 0x04, 0x00);
+        rtl8225_write_phy_ofdm(dev, 0x05, 0x00);
+        rtl8225_write_phy_ofdm(dev, 0x06, 0x40);
+        rtl8225_write_phy_ofdm(dev, 0x07, 0x00);
+        rtl8225_write_phy_ofdm(dev, 0x08, 0x40);
+        rtl8225_write_phy_ofdm(dev, 0x09, 0xfe);
+        rtl8225_write_phy_ofdm(dev, 0x0a, 0x08);
+        rtl8225_write_phy_ofdm(dev, 0x0b, 0x80);
+        rtl8225_write_phy_ofdm(dev, 0x0c, 0x01);
         rtl8225_write_phy_ofdm(dev, 0x0d, 0x43);
-        rtl8225_write_phy_ofdm(dev, 0x0e, 0xd3); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x0f, 0x38); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x10, 0x84); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x11, 0x07); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x12, 0x20); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x13, 0x20); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x14, 0x00); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x15, 0x40); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x16, 0x00); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x17, 0x40); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x18, 0xef); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x19, 0x19); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x1a, 0x20); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x1b, 0x15); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x1c, 0x04); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x1d, 0xc5); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x1e, 0x95); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x1f, 0x75); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x20, 0x1f); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x21, 0x17); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x22, 0x16); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x23, 0x80); msleep(1); //FIXME: not needed?
-        rtl8225_write_phy_ofdm(dev, 0x24, 0x46); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x25, 0x00); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x26, 0x90); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x27, 0x88); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x0e, 0xd3);
+        rtl8225_write_phy_ofdm(dev, 0x0f, 0x38);
+        rtl8225_write_phy_ofdm(dev, 0x10, 0x84);
+        rtl8225_write_phy_ofdm(dev, 0x11, 0x07);
+        rtl8225_write_phy_ofdm(dev, 0x12, 0x20);
+        rtl8225_write_phy_ofdm(dev, 0x13, 0x20);
+        rtl8225_write_phy_ofdm(dev, 0x14, 0x00);
+        rtl8225_write_phy_ofdm(dev, 0x15, 0x40);
+        rtl8225_write_phy_ofdm(dev, 0x16, 0x00);
+        rtl8225_write_phy_ofdm(dev, 0x17, 0x40);
+        rtl8225_write_phy_ofdm(dev, 0x18, 0xef);
+        rtl8225_write_phy_ofdm(dev, 0x19, 0x19);
+        rtl8225_write_phy_ofdm(dev, 0x1a, 0x20);
+        rtl8225_write_phy_ofdm(dev, 0x1b, 0x15);
+        rtl8225_write_phy_ofdm(dev, 0x1c, 0x04);
+        rtl8225_write_phy_ofdm(dev, 0x1d, 0xc5);
+        rtl8225_write_phy_ofdm(dev, 0x1e, 0x95);
+        rtl8225_write_phy_ofdm(dev, 0x1f, 0x75);
+        rtl8225_write_phy_ofdm(dev, 0x20, 0x1f);
+        rtl8225_write_phy_ofdm(dev, 0x21, 0x17);
+        rtl8225_write_phy_ofdm(dev, 0x22, 0x16);
+        rtl8225_write_phy_ofdm(dev, 0x23, 0x80);
+        rtl8225_write_phy_ofdm(dev, 0x24, 0x46);
+        rtl8225_write_phy_ofdm(dev, 0x25, 0x00);
+        rtl8225_write_phy_ofdm(dev, 0x26, 0x90);
+        rtl8225_write_phy_ofdm(dev, 0x27, 0x88);
 
         rtl8225_write_phy_ofdm(dev, 0x0b, rtl8225z2_gain_bg[4 * 3]);
         rtl8225_write_phy_ofdm(dev, 0x1b, rtl8225z2_gain_bg[4 * 3 + 1]);
         rtl8225_write_phy_ofdm(dev, 0x1d, rtl8225z2_gain_bg[4 * 3 + 2]);
         rtl8225_write_phy_ofdm(dev, 0x21, 0x37);
 
-        rtl8225_write_phy_cck(dev, 0x00, 0x98); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x03, 0x20); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x04, 0x7e); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x05, 0x12); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x06, 0xfc); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x07, 0x78); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x08, 0x2e); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x10, 0x9b); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x11, 0x88); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x12, 0x47); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x00, 0x98);
+        rtl8225_write_phy_cck(dev, 0x03, 0x20);
+        rtl8225_write_phy_cck(dev, 0x04, 0x7e);
+        rtl8225_write_phy_cck(dev, 0x05, 0x12);
+        rtl8225_write_phy_cck(dev, 0x06, 0xfc);
+        rtl8225_write_phy_cck(dev, 0x07, 0x78);
+        rtl8225_write_phy_cck(dev, 0x08, 0x2e);
+        rtl8225_write_phy_cck(dev, 0x10, 0x9b);
+        rtl8225_write_phy_cck(dev, 0x11, 0x88);
+        rtl8225_write_phy_cck(dev, 0x12, 0x47);
         rtl8225_write_phy_cck(dev, 0x13, 0xd0);
         rtl8225_write_phy_cck(dev, 0x19, 0x00);
         rtl8225_write_phy_cck(dev, 0x1a, 0xa0);
         rtl8225_write_phy_cck(dev, 0x1b, 0x08);
         rtl8225_write_phy_cck(dev, 0x40, 0x86);
-        rtl8225_write_phy_cck(dev, 0x41, 0x8d); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x42, 0x15); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x43, 0x18); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x44, 0x36); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x45, 0x35); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x46, 0x2e); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x47, 0x25); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x48, 0x1c); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x49, 0x12); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x4a, 0x09); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x4b, 0x04); msleep(1);
-        rtl8225_write_phy_cck(dev, 0x4c, 0x05); msleep(1);
+        rtl8225_write_phy_cck(dev, 0x41, 0x8d);
+        rtl8225_write_phy_cck(dev, 0x42, 0x15);
+        rtl8225_write_phy_cck(dev, 0x43, 0x18);
+        rtl8225_write_phy_cck(dev, 0x44, 0x36);
+        rtl8225_write_phy_cck(dev, 0x45, 0x35);
+        rtl8225_write_phy_cck(dev, 0x46, 0x2e);
+        rtl8225_write_phy_cck(dev, 0x47, 0x25);
+        rtl8225_write_phy_cck(dev, 0x48, 0x1c);
+        rtl8225_write_phy_cck(dev, 0x49, 0x12);
+        rtl8225_write_phy_cck(dev, 0x4a, 0x09);
+        rtl8225_write_phy_cck(dev, 0x4b, 0x04);
+        rtl8225_write_phy_cck(dev, 0x4c, 0x05);
 
         rtl818x_iowrite8(priv, (u8 *)0xFF5B, 0x0D); msleep(1);
 
         rtl8225z2_rf_set_tx_power(dev, 1);
 
         /* RX antenna default to A */
-        rtl8225_write_phy_cck(dev, 0x10, 0x9b); msleep(1);      /* B: 0xDB */
-        rtl8225_write_phy_ofdm(dev, 0x26, 0x90); msleep(1);     /* B: 0x10 */
+        rtl8225_write_phy_cck(dev, 0x10, 0x9b);                 /* B: 0xDB */
+        rtl8225_write_phy_ofdm(dev, 0x26, 0x90);                /* B: 0x10 */
 
         rtl818x_iowrite8(priv, &priv->map->TX_ANTENNA, 0x03);   /* B: 0x00 */
         msleep(1);
@@ -835,40 +830,38 @@ static void rtl8225z2_b_rf_init(struct ieee80211_hw *dev)
         struct rtl8187_priv *priv = dev->priv;
         int i;
 
-        rtl8225_write(dev, 0x0, 0x0B7); msleep(1);
-        rtl8225_write(dev, 0x1, 0xEE0); msleep(1);
-        rtl8225_write(dev, 0x2, 0x44D); msleep(1);
-        rtl8225_write(dev, 0x3, 0x441); msleep(1);
-        rtl8225_write(dev, 0x4, 0x8C3); msleep(1);
-        rtl8225_write(dev, 0x5, 0xC72); msleep(1);
-        rtl8225_write(dev, 0x6, 0x0E6); msleep(1);
-        rtl8225_write(dev, 0x7, 0x82A); msleep(1);
-        rtl8225_write(dev, 0x8, 0x03F); msleep(1);
-        rtl8225_write(dev, 0x9, 0x335); msleep(1);
-        rtl8225_write(dev, 0xa, 0x9D4); msleep(1);
-        rtl8225_write(dev, 0xb, 0x7BB); msleep(1);
-        rtl8225_write(dev, 0xc, 0x850); msleep(1);
-        rtl8225_write(dev, 0xd, 0xCDF); msleep(1);
-        rtl8225_write(dev, 0xe, 0x02B); msleep(1);
-        rtl8225_write(dev, 0xf, 0x114); msleep(1);
-
-        rtl8225_write(dev, 0x0, 0x1B7); msleep(1);
+        rtl8225_write(dev, 0x0, 0x0B7);
+        rtl8225_write(dev, 0x1, 0xEE0);
+        rtl8225_write(dev, 0x2, 0x44D);
+        rtl8225_write(dev, 0x3, 0x441);
+        rtl8225_write(dev, 0x4, 0x8C3);
+        rtl8225_write(dev, 0x5, 0xC72);
+        rtl8225_write(dev, 0x6, 0x0E6);
+        rtl8225_write(dev, 0x7, 0x82A);
+        rtl8225_write(dev, 0x8, 0x03F);
+        rtl8225_write(dev, 0x9, 0x335);
+        rtl8225_write(dev, 0xa, 0x9D4);
+        rtl8225_write(dev, 0xb, 0x7BB);
+        rtl8225_write(dev, 0xc, 0x850);
+        rtl8225_write(dev, 0xd, 0xCDF);
+        rtl8225_write(dev, 0xe, 0x02B);
+        rtl8225_write(dev, 0xf, 0x114);
+
+        rtl8225_write(dev, 0x0, 0x1B7);
 
         for (i = 0; i < ARRAY_SIZE(rtl8225z2_rxgain); i++) {
-                rtl8225_write(dev, 0x1, i + 1); msleep(1);
-                rtl8225_write(dev, 0x2, rtl8225z2_rxgain[i]); msleep(1);
+                rtl8225_write(dev, 0x1, i + 1);
+                rtl8225_write(dev, 0x2, rtl8225z2_rxgain[i]);
         }
 
-        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, 0x3, 0x080);
+        rtl8225_write(dev, 0x5, 0x004);
+        rtl8225_write(dev, 0x0, 0x0B7);
 
-        rtl8225_write(dev, 0x2, 0xC4D); msleep(1);
-        msleep(2000);
+        rtl8225_write(dev, 0x2, 0xC4D);
 
-        rtl8225_write(dev, 0x2, 0x44D); msleep(1);
-        rtl8225_write(dev, 0x0, 0x2BF); msleep(1);
+        rtl8225_write(dev, 0x2, 0x44D);
+        rtl8225_write(dev, 0x0, 0x2BF);
 
         rtl818x_iowrite8(priv, &priv->map->TX_GAIN_CCK, 0x03);
         rtl818x_iowrite8(priv, &priv->map->TX_GAIN_OFDM, 0x07);
@@ -891,10 +884,10 @@ static void rtl8225z2_b_rf_init(struct ieee80211_hw *dev)
         rtl818x_iowrite32(priv, (__le32 *)0xFFFC, (7 << 12) | (3 << 8) | 28);
         rtl818x_iowrite8(priv, &priv->map->ACM_CONTROL, 0);
 
-        rtl8225_write_phy_ofdm(dev, 0x97, 0x46); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0xa4, 0xb6); msleep(1);
-        rtl8225_write_phy_ofdm(dev, 0x85, 0xfc); msleep(1);
-        rtl8225_write_phy_cck(dev, 0xc1, 0x88); msleep(1);
+        rtl8225_write_phy_ofdm(dev, 0x97, 0x46);
+        rtl8225_write_phy_ofdm(dev, 0xa4, 0xb6);
+        rtl8225_write_phy_ofdm(dev, 0x85, 0xfc);
+        rtl8225_write_phy_cck(dev, 0xc1, 0x88);
 }
 
 static void rtl8225_rf_stop(struct ieee80211_hw *dev)
@@ -902,7 +895,7 @@ static void rtl8225_rf_stop(struct ieee80211_hw *dev)
         u8 reg;
         struct rtl8187_priv *priv = dev->priv;
 
-        rtl8225_write(dev, 0x4, 0x1f); msleep(1);
+        rtl8225_write(dev, 0x4, 0x1f);
 
         rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
         reg = rtl818x_ioread8(priv, &priv->map->CONFIG3);