rtl8xxxu: Group chip quirks together

Group chip quirks together instead of having them scattered all over
in the init code.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
index f20568b14c3b23808aed8171ef4b47f3b12b4295..ad6371985402cfdf05f83192a44afef6b7934fcb 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
@@ -6028,18 +6028,6 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
        if (ret)
                goto exit;
 
-       /* Fix USB interface interference issue */
-       if (priv->rtlchip == 0x8723a) {
-               rtl8xxxu_write8(priv, 0xfe40, 0xe0);
-               rtl8xxxu_write8(priv, 0xfe41, 0x8d);
-               rtl8xxxu_write8(priv, 0xfe42, 0x80);
-               rtl8xxxu_write32(priv, REG_TXDMA_OFFSET_CHK, 0xfd0320);
-       } else {
-               val32 = rtl8xxxu_read32(priv, REG_TXDMA_OFFSET_CHK);
-               val32 |= TXDMA_OFFSET_DROP_DATA_EN;
-               rtl8xxxu_write32(priv, REG_TXDMA_OFFSET_CHK, val32);
-       }
-
        /* Solve too many protocol error on USB bus */
        /* Can't do this for 8188/8192 UMC A cut parts */
        if (priv->rtlchip == 0x8723a ||
@@ -6127,11 +6115,25 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
        if (ret)
                goto exit;
 
-       if (priv->rtlchip == 0x8723a) { /* Reduce 80M spur */
+       /*
+        * Chip specific quirks
+        */
+       if (priv->rtlchip == 0x8723a) {
+               /* Fix USB interface interference issue */
+               rtl8xxxu_write8(priv, 0xfe40, 0xe0);
+               rtl8xxxu_write8(priv, 0xfe41, 0x8d);
+               rtl8xxxu_write8(priv, 0xfe42, 0x80);
+               rtl8xxxu_write32(priv, REG_TXDMA_OFFSET_CHK, 0xfd0320);
+
+               /* Reduce 80M spur */
                rtl8xxxu_write32(priv, REG_AFE_XTAL_CTRL, 0x0381808d);
                rtl8xxxu_write32(priv, REG_AFE_PLL_CTRL, 0xf0ffff83);
                rtl8xxxu_write32(priv, REG_AFE_PLL_CTRL, 0xf0ffff82);
                rtl8xxxu_write32(priv, REG_AFE_PLL_CTRL, 0xf0ffff83);
+       } else {
+               val32 = rtl8xxxu_read32(priv, REG_TXDMA_OFFSET_CHK);
+               val32 |= TXDMA_OFFSET_DROP_DATA_EN;
+               rtl8xxxu_write32(priv, REG_TXDMA_OFFSET_CHK, val32);
        }
 
        if (!macpower){