rtl8187: consolidate anaparam on/off write sequences

[net-next-2.6.git] / drivers / net / wireless / rtl818x / rtl8187_rtl8225.c

diff --git a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c b/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
index 97eebdcf7eb9f432729c18a3ad090fe8934e0171..5c6666f09ac1613de2833bc1cac968e1102578c0 100644 (file)
--- a/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c
@@ -898,29 +898,7 @@ static void rtl8225z2_b_rf_init(struct ieee80211_hw *dev)
 
 static void rtl8225_rf_stop(struct ieee80211_hw *dev)
 {
-       u8 reg;
-       struct rtl8187_priv *priv = dev->priv;
-
        rtl8225_write(dev, 0x4, 0x1f);
-
-       rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
-       reg = rtl818x_ioread8(priv, &priv->map->CONFIG3);
-       rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg | RTL818X_CONFIG3_ANAPARAM_WRITE);
-       if (!priv->is_rtl8187b) {
-               rtl818x_iowrite32(priv, &priv->map->ANAPARAM2,
-                                 RTL8187_RTL8225_ANAPARAM2_OFF);
-               rtl818x_iowrite32(priv, &priv->map->ANAPARAM,
-                                 RTL8187_RTL8225_ANAPARAM_OFF);
-       } else {
-               rtl818x_iowrite32(priv, &priv->map->ANAPARAM2,
-                                 RTL8187B_RTL8225_ANAPARAM2_OFF);
-               rtl818x_iowrite32(priv, &priv->map->ANAPARAM,
-                                 RTL8187B_RTL8225_ANAPARAM_OFF);
-               rtl818x_iowrite8(priv, &priv->map->ANAPARAM3,
-                                 RTL8187B_RTL8225_ANAPARAM3_OFF);
-       }
-       rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg & ~RTL818X_CONFIG3_ANAPARAM_WRITE);
-       rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);
 }
 
 static void rtl8225_rf_set_channel(struct ieee80211_hw *dev,