diff options
author | Joe Perches <joe@perches.com> | 2013-03-18 20:55:41 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 11:16:17 -0700 |
commit | 96d69e201bbdb05c363e899138f9f42bc8ad8f88 (patch) | |
tree | f3ba7f8c5436cfbce1617f415febbd681fe78fd4 /drivers/staging/vt6655/baseband.c | |
parent | bda2a44e2a015535f08aecd5c98e263098db9e75 (diff) | |
download | linux-96d69e201bbdb05c363e899138f9f42bc8ad8f88.tar.gz linux-96d69e201bbdb05c363e899138f9f42bc8ad8f88.tar.bz2 linux-96d69e201bbdb05c363e899138f9f42bc8ad8f88.zip |
staging: vt6655: Remove unnecessary blank lines
Remove a bunch of useless vertical whitespace.
Convert 3 or more consecutive newlines to 2.
Remove blank lines after open brace and before close brace.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/baseband.c')
-rw-r--r-- | drivers/staging/vt6655/baseband.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/drivers/staging/vt6655/baseband.c b/drivers/staging/vt6655/baseband.c index 8df3973dd262..c26418d806fb 100644 --- a/drivers/staging/vt6655/baseband.c +++ b/drivers/staging/vt6655/baseband.c @@ -74,8 +74,6 @@ static int msglevel = MSG_LEVEL_INFO; /*--------------------- Static Variables --------------------------*/ - - #define CB_VT3253_INIT_FOR_RFMD 446 unsigned char byVT3253InitTab_RFMD[CB_VT3253_INIT_FOR_RFMD][2] = { {0x00, 0x30}, @@ -1248,8 +1246,6 @@ unsigned char byVT3253B0_AIROHA2230[CB_VT3253B0_INIT_FOR_AIROHA2230][2] = { {0xff, 0x00}, }; - - #define CB_VT3253B0_INIT_FOR_UW2451 256 //For UW2451 unsigned char byVT3253B0_UW2451[CB_VT3253B0_INIT_FOR_UW2451][2] = { @@ -1713,7 +1709,6 @@ unsigned char byVT3253B0_AGC[CB_VT3253B0_AGC][2] = { const unsigned short awcFrameTime[MAX_RATE] = {10, 20, 55, 110, 24, 36, 48, 72, 96, 144, 192, 216}; - /*--------------------- Static Functions --------------------------*/ static @@ -1754,7 +1749,6 @@ s_vChangeAntenna( } } - /*--------------------- Export Variables --------------------------*/ /* * Description: Calculate data frame transmitting time @@ -1784,7 +1778,6 @@ BBuGetFrameTime( unsigned int uRateIdx = (unsigned int) wRate; unsigned int uRate = 0; - if (uRateIdx > RATE_54M) { ASSERT(0); return 0; @@ -2026,7 +2019,6 @@ bool BBbReadEmbedded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned ch return true; } - /* * Description: Write a Byte to BASEBAND, by embedded programming * @@ -2068,7 +2060,6 @@ bool BBbWriteEmbedded(unsigned long dwIoBase, unsigned char byBBAddr, unsigned c return true; } - /* * Description: Test if all bits are set for the Baseband register * @@ -2091,7 +2082,6 @@ bool BBbIsRegBitsOn(unsigned long dwIoBase, unsigned char byBBAddr, unsigned cha return (byOrgData & byTestBits) == byTestBits; } - /* * Description: Test if all bits are clear for the Baseband register * @@ -2289,8 +2279,6 @@ bool BBbVT3253Init(PSDevice pDevice) return bResult; } - - /* * Description: Read All Baseband Registers * @@ -2328,7 +2316,6 @@ void BBvReadAllRegs(unsigned long dwIoBase, unsigned char *pbyBBRegs) * */ - void BBvLoopbackOn(PSDevice pDevice) { unsigned char byData; @@ -2402,11 +2389,8 @@ void BBvLoopbackOff(PSDevice pDevice) } BBbReadEmbedded(dwIoBase, 0x0E, &byData);//CR14 BBbWriteEmbedded(dwIoBase, 0x0E, (unsigned char)(byData | 0x80));//CR14 - } - - /* * Description: Set ShortSlotTime mode * @@ -2440,7 +2424,6 @@ BBvSetShortSlotTime(PSDevice pDevice) } BBbWriteEmbedded(pDevice->PortOffset, 0x0A, byBBRxConf);//CR10 - } void BBvSetVGAGainOffset(PSDevice pDevice, unsigned char byData) @@ -2462,7 +2445,6 @@ void BBvSetVGAGainOffset(PSDevice pDevice, unsigned char byData) BBbWriteEmbedded(pDevice->PortOffset, 0x0A, byBBRxConf);//CR10 } - /* * Description: Baseband SoftwareReset * @@ -2561,9 +2543,6 @@ BBvSetTxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode) BBbWriteEmbedded(dwIoBase, 0x09, byBBTxConf);//CR09 } - - - /* * Description: Set Rx Antenna mode * @@ -2596,7 +2575,6 @@ BBvSetRxAntennaMode(unsigned long dwIoBase, unsigned char byAntennaMode) BBbWriteEmbedded(dwIoBase, 0x0A, byBBRxConf);//CR10 } - /* * Description: BBvSetDeepSleep * @@ -2623,8 +2601,6 @@ BBvExitDeepSleep(unsigned long dwIoBase, unsigned char byLocalID) BBbWriteEmbedded(dwIoBase, 0x0D, 0x01);//CR13 } - - static unsigned long s_ulGetRatio(PSDevice pDevice) @@ -2733,7 +2709,6 @@ s_ulGetRatio(PSDevice pDevice) return ulRatio; } - void BBvClearAntDivSQ3Value(PSDevice pDevice) { @@ -2745,7 +2720,6 @@ BBvClearAntDivSQ3Value(PSDevice pDevice) } } - /* * Description: Antenna Diversity * @@ -2764,7 +2738,6 @@ BBvClearAntDivSQ3Value(PSDevice pDevice) void BBvAntennaDiversity(PSDevice pDevice, unsigned char byRxRate, unsigned char bySQ3) { - if ((byRxRate >= MAX_RATE) || (pDevice->wAntDiversityMaxRate >= MAX_RATE)) { return; } @@ -2774,13 +2747,11 @@ BBvAntennaDiversity(PSDevice pDevice, unsigned char byRxRate, unsigned char bySQ pDevice->uNumSQ3[byRxRate]++; if (pDevice->byAntennaState == 0) { - if (pDevice->uDiversityCnt > pDevice->ulDiversityNValue) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ulDiversityNValue=[%d],54M-[%d]\n", (int)pDevice->ulDiversityNValue, (int)pDevice->uNumSQ3[(int)pDevice->wAntDiversityMaxRate]); if (pDevice->uNumSQ3[pDevice->wAntDiversityMaxRate] < pDevice->uDiversityCnt/2) { - pDevice->ulRatio_State0 = s_ulGetRatio(pDevice); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "SQ3_State0, rate = [%08x]\n", (int)pDevice->ulRatio_State0); @@ -2798,7 +2769,6 @@ BBvAntennaDiversity(PSDevice pDevice, unsigned char byRxRate, unsigned char bySQ add_timer(&pDevice->TimerSQ3Tmax1); } else { - pDevice->TimerSQ3Tmax3.expires = RUN_AT(pDevice->byTMax3 * HZ); add_timer(&pDevice->TimerSQ3Tmax3); } @@ -2808,7 +2778,6 @@ BBvAntennaDiversity(PSDevice pDevice, unsigned char byRxRate, unsigned char bySQ } else { //byAntennaState == 1 if (pDevice->uDiversityCnt > pDevice->ulDiversityMValue) { - del_timer(&pDevice->TimerSQ3Tmax1); pDevice->ulRatio_State1 = s_ulGetRatio(pDevice); @@ -2868,12 +2837,10 @@ TimerSQ3CallBack( add_timer(&pDevice->TimerSQ3Tmax3); add_timer(&pDevice->TimerSQ3Tmax2); - spin_unlock_irq(&pDevice->lock); return; } - /*+ * * Description: @@ -2903,7 +2870,6 @@ TimerState1CallBack( spin_lock_irq(&pDevice->lock); if (pDevice->uDiversityCnt < pDevice->ulDiversityMValue/100) { - s_vChangeAntenna(pDevice); pDevice->TimerSQ3Tmax3.expires = RUN_AT(pDevice->byTMax3 * HZ); pDevice->TimerSQ3Tmax2.expires = RUN_AT(pDevice->byTMax2 * HZ); @@ -2934,4 +2900,3 @@ TimerState1CallBack( return; } - |