Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...

[karo-tx-linux.git] / drivers / staging / vt6655 / ioctl.c

diff --git a/drivers/staging/vt6655/ioctl.c b/drivers/staging/vt6655/ioctl.c
index afed6e33dfc78ed7e8bf8cdb1756616fecb00034..2ae8116869eb1754411cd53633ce5f2186f8acf5 100644 (file)
--- a/drivers/staging/vt6655/ioctl.c
+++ b/drivers/staging/vt6655/ioctl.c
@@ -41,7 +41,7 @@
 static int msglevel = MSG_LEVEL_INFO;
 
 #ifdef WPA_SM_Transtatus
-       SWPAResult wpa_Result;
+SWPAResult wpa_Result;
 #endif
 
 int private_ioctl(PSDevice pDevice, struct ifreq *rq)
@@ -104,9 +104,9 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
                        BSSvClearBSSList((void *)pDevice, pDevice->bLinkPass);
 
                if (pItemSSID->len != 0)
-                       bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, abyScanSSID);
+                       bScheduleCommand((void *)pDevice, WLAN_CMD_BSSID_SCAN, abyScanSSID);
                else
-                       bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, NULL);
+                       bScheduleCommand((void *)pDevice, WLAN_CMD_BSSID_SCAN, NULL);
                spin_unlock_irq(&pDevice->lock);
                break;
 
@@ -202,8 +202,8 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
                netif_stop_queue(pDevice->dev);
                spin_lock_irq(&pDevice->lock);
                pMgmt->eCurrState = WMAC_STATE_IDLE;
-               bScheduleCommand((void *) pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);
-               bScheduleCommand((void *) pDevice, WLAN_CMD_SSID, NULL);
+               bScheduleCommand((void *)pDevice, WLAN_CMD_BSSID_SCAN, pMgmt->abyDesireSSID);
+               bScheduleCommand((void *)pDevice, WLAN_CMD_SSID, NULL);
                spin_unlock_irq(&pDevice->lock);
                break;
 
@@ -267,7 +267,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
                        memcpy(sLinkStatus.abySSID, pItemSSID->abySSID, pItemSSID->len);
                        memcpy(sLinkStatus.abyBSSID, pMgmt->abyCurrBSSID, WLAN_BSSID_LEN);
                        sLinkStatus.uLinkRate = pMgmt->sNodeDBTable[0].wTxDataRate;
-                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Link Success!\n");
+                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " Link Success!\n");
                } else {
                        sLinkStatus.bLink = false;
                        sLinkStatus.uLinkRate = 0;
@@ -311,7 +311,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
                }
                pList->uItem = sList.uItem;
                pBSS = &(pMgmt->sBSSList[0]);
-               for (ii = 0, jj = 0; jj < MAX_BSS_NUM ; jj++) {
+               for (ii = 0, jj = 0; jj < MAX_BSS_NUM; jj++) {
                        pBSS = &(pMgmt->sBSSList[jj]);
                        if (pBSS->bActive) {
                                pList->sBSSIDList[ii].uChannel = pBSS->uChannel;
@@ -540,7 +540,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq)
                }
 
                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Support Rate= %*ph\n",
-                               4, pMgmt->abyIBSSSuppRates + 2);
+                       4, pMgmt->abyIBSSSuppRates + 2);
 
                netif_stop_queue(pDevice->dev);
                spin_lock_irq(&pDevice->lock);