Merge tag 'spi-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

[~andy/linux] / drivers / staging / vt6655 / vntwifi.c

diff --git a/drivers/staging/vt6655/vntwifi.c b/drivers/staging/vt6655/vntwifi.c
index 23a2a225307542763b686f8854bf07e4d1ceedb6..d8f4f8e7d05eba72281375483ca35fe09f7fbd46 100644 (file)
--- a/drivers/staging/vt6655/vntwifi.c
+++ b/drivers/staging/vt6655/vntwifi.c
@@ -78,7 +78,6 @@ VNTWIFIvSetOPMode(
        pMgmt->eConfigMode = eOPMode;
 }
 
-
 /*+
  *
  * Description:
@@ -131,7 +130,7 @@ VNTWIFIpGetCurrentSSID(
 )
 {
        PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
-       return((PWLAN_IE_SSID) pMgmt->abyCurrSSID);
+       return (PWLAN_IE_SSID) pMgmt->abyCurrSSID;
 }
 
 /*+
@@ -155,7 +154,7 @@ VNTWIFIpGetCurrentChannel(
 {
        PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
        if (pMgmtHandle != NULL) {
-               return (pMgmt->uCurrChannel);
+               return pMgmt->uCurrChannel;
        }
        return 0;
 }
@@ -180,11 +179,9 @@ VNTWIFIwGetAssocID(
 )
 {
        PSMgmtObject        pMgmt = (PSMgmtObject)pMgmtHandle;
-       return(pMgmt->wCurrAID);
+       return pMgmt->wCurrAID;
 }
 
-
-
 /*+
  *
  * Description:
@@ -354,8 +351,6 @@ VNTWIFIvSetEncryptionMode(
        }
 }
 
-
-
 bool
 VNTWIFIbConfigPhyMode(
        void *pMgmtHandle,
@@ -369,14 +364,13 @@ VNTWIFIbConfigPhyMode(
                if (CARDbSetPhyParameter(pMgmt->pAdapter, ePhyType, 0, 0, NULL, NULL) == true) {
                        pMgmt->eCurrentPHYMode = ePhyType;
                } else {
-                       return(false);
+                       return false;
                }
        }
        pMgmt->eConfigPHYMode = ePhyType;
-       return(true);
+       return true;
 }
 
-
 void
 VNTWIFIbGetConfigPhyMode(
        void *pMgmtHandle,
@@ -405,7 +399,6 @@ VNTWIFIbGetConfigPhyMode(
  *
  -*/
 
-
 /*+
  *
  * Description:
@@ -445,9 +438,6 @@ VNTWIFIvQueryBSSList(void *pMgmtHandle, unsigned int *puBSSCount, void **pvFirst
        *puBSSCount = uCount;
 }
 
-
-
-
 void
 VNTWIFIvGetNextBSS(
        void *pMgmtHandle,
@@ -472,10 +462,6 @@ VNTWIFIvGetNextBSS(
        }
 }
 
-
-
-
-
 /*+
  *
  * Description:
@@ -522,7 +508,6 @@ VNTWIFIvUpdateNodeTxCounter(
        return;
 }
 
-
 void
 VNTWIFIvGetTxRate(
        void *pMgmtHandle,
@@ -542,7 +527,6 @@ VNTWIFIvGetTxRate(
        PWLAN_IE_SUPP_RATES pSupportRateIEs = NULL;
        PWLAN_IE_SUPP_RATES pExtSupportRateIEs = NULL;
 
-
        if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) ||
            (pMgmt->eCurrMode == WMAC_MODE_ESS_AP)) {
                // Adhoc Tx rate decided from node DB
@@ -567,7 +551,6 @@ VNTWIFIvGetTxRate(
                       pMgmt->sNodeDBTable[0].abyMACAddr, wTxDataRate);
 #endif
 
-
                pSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrSuppRates;
                pExtSupportRateIEs = (PWLAN_IE_SUPP_RATES) pMgmt->abyCurrExtSuppRates;
        }
@@ -602,24 +585,21 @@ VNTWIFIbyGetKeyCypher(
        PSMgmtObject    pMgmt = (PSMgmtObject)pMgmtHandle;
 
        if (bGroupKey == true) {
-               return (pMgmt->byCSSGK);
+               return pMgmt->byCSSGK;
        } else {
-               return (pMgmt->byCSSPK);
+               return pMgmt->byCSSPK;
        }
 }
 
-
 /*
   bool
   VNTWIFIbInit(
   void *pAdapterHandler,
   void **pMgmtHandler
 ) {
-
   PSMgmtObject        pMgmt = NULL;
   unsigned int ii;
 
-
   pMgmt = (PSMgmtObject)kmalloc(sizeof(SMgmtObject), (int)GFP_ATOMIC);
   if (pMgmt == NULL) {
   *pMgmtHandler = NULL;
@@ -651,8 +631,6 @@ VNTWIFIbyGetKeyCypher(
   }
 */
 
-
-
 bool
 VNTWIFIbSetPMKIDCache(
        void *pMgmtObject,
@@ -663,15 +641,13 @@ VNTWIFIbSetPMKIDCache(
        PSMgmtObject    pMgmt = (PSMgmtObject) pMgmtObject;
 
        if (ulCount > MAX_PMKID_CACHE) {
-               return (false);
+               return false;
        }
        pMgmt->gsPMKIDCache.BSSIDInfoCount = ulCount;
        memcpy(pMgmt->gsPMKIDCache.BSSIDInfo, pPMKIDInfo, (ulCount*sizeof(PMKIDInfo)));
-       return (true);
+       return true;
 }
 
-
-
 unsigned short
 VNTWIFIwGetMaxSupportRate(
        void *pMgmtObject
@@ -682,17 +658,16 @@ VNTWIFIwGetMaxSupportRate(
 
        for (wRate = RATE_54M; wRate > RATE_1M; wRate--) {
                if (pMgmt->sNodeDBTable[0].wSuppRate & (1<<wRate)) {
-                       return (wRate);
+                       return wRate;
                }
        }
        if (pMgmt->eCurrentPHYMode == PHY_TYPE_11A) {
-               return (RATE_6M);
+               return RATE_6M;
        } else {
-               return (RATE_1M);
+               return RATE_1M;
        }
 }
 
-
 void
 VNTWIFIvSet11h(
        void *pMgmtObject,
@@ -760,10 +735,9 @@ VNTWIFIbMeasureReport(
                IEEE11hbMSRRepTx(pMgmt);
        }
        //spin_unlock_irq(&pDevice->lock);
-       return (true);
+       return true;
 }
 
-
 bool
 VNTWIFIbChannelSwitch(
        void *pMgmtObject,
@@ -800,4 +774,3 @@ VNTWIFIbChannelSwitch(
   return true;
   }
 */
-