These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / vt6655 / baseband.c

diff --git a/kernel/drivers/staging/vt6655/baseband.c b/kernel/drivers/staging/vt6655/baseband.c
index b0ea38f..1e6c0c4 100644 (file)
--- a/kernel/drivers/staging/vt6655/baseband.c
+++ b/kernel/drivers/staging/vt6655/baseband.c
@@ -1728,10 +1728,8 @@ BBuGetFrameTime(
        unsigned int uRateIdx = (unsigned int) wRate;
        unsigned int uRate = 0;
 
-       if (uRateIdx > RATE_54M) {
-               ASSERT(0);
+       if (uRateIdx > RATE_54M)
                return 0;
-       }
 
        uRate = (unsigned int)awcFrameTime[uRateIdx];
 
@@ -1945,7 +1943,6 @@ bool BBbReadEmbedded(struct vnt_private *priv,
        VNSvInPortB(dwIoBase + MAC_REG_BBREGDATA, pbyData);
 
        if (ww == W_MAX_TIMEOUT) {
-               DBG_PORT80(0x30);
                pr_debug(" DBG_PORT80(0x30)\n");
                return false;
        }
@@ -1988,7 +1985,6 @@ bool BBbWriteEmbedded(struct vnt_private *priv,
        }
 
        if (ww == W_MAX_TIMEOUT) {
-               DBG_PORT80(0x31);
                pr_debug(" DBG_PORT80(0x31)\n");
                return false;
        }
@@ -2093,9 +2089,19 @@ bool BBbVT3253Init(struct vnt_private *priv)
                                byVT3253B0_UW2451[ii][0],
                                byVT3253B0_UW2451[ii][1]);
 
-               /* Init ANT B select,TX Config CR09 = 0x61->0x45, 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B inverted) */
+               /* Init ANT B select,
+                * TX Config CR09 = 0x61->0x45,
+                * 0x45->0x41(VC1/VC2 define, make the ANT_A, ANT_B inverted)
+                */
+
                /*bResult &= BBbWriteEmbedded(dwIoBase,0x09,0x41);*/
-               /* Init ANT B select,RX Config CR10 = 0x28->0x2A, 0x2A->0x28(VC1/VC2 define, make the ANT_A, ANT_B inverted) */
+
+               /* Init ANT B select,
+                * RX Config CR10 = 0x28->0x2A,
+                * 0x2A->0x28(VC1/VC2 define,
+                * make the ANT_A, ANT_B inverted)
+                */
+
                /*bResult &= BBbWriteEmbedded(dwIoBase,0x0a,0x28);*/
                /* Select VC1/VC2, CR215 = 0x02->0x06 */
                bResult &= BBbWriteEmbedded(priv, 0xd7, 0x06);