staging: vt6655: clean up the tail of function device_init_registers
authorMalcolm Priestley <tvboxspy@gmail.com>
Mon, 28 Jul 2014 22:26:26 +0000 (23:26 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 31 Jul 2014 00:08:20 +0000 (17:08 -0700)
Aligning the code.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/device_main.c

index 0ecc99bf8ab4c39f929149ea589b4e4c9df43468..3f72c34ecddd253318cd3de7905ccda4a6ddda10 100644 (file)
@@ -736,30 +736,31 @@ static void device_init_registers(PSDevice pDevice)
        if (pDevice->bHWRadioOff || pDevice->bRadioControlOff)
                CARDbRadioPowerOff(pDevice);
 
-pMgmt->eScanType = WMAC_SCAN_PASSIVE;
-// get Permanent network address
-SROMvReadEtherAddress(pDevice->PortOffset, pDevice->abyCurrentNetAddr);
-DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Network address = %pM\n",
-       pDevice->abyCurrentNetAddr);
+       pMgmt->eScanType = WMAC_SCAN_PASSIVE;
 
-// reset Tx pointer
-CARDvSafeResetRx(pDevice);
-// reset Rx pointer
-CARDvSafeResetTx(pDevice);
+       /* get Permanent network address */
+       SROMvReadEtherAddress(pDevice->PortOffset, pDevice->abyCurrentNetAddr);
+       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Network address = %pM\n",
+               pDevice->abyCurrentNetAddr);
 
-if (pDevice->byLocalID <= REV_ID_VT3253_A1)
-       MACvRegBitsOn(pDevice->PortOffset, MAC_REG_RCR, RCR_WPAERR);
+       /* reset Tx pointer */
+       CARDvSafeResetRx(pDevice);
+       /* reset Rx pointer */
+       CARDvSafeResetTx(pDevice);
 
-pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;
+       if (pDevice->byLocalID <= REV_ID_VT3253_A1)
+               MACvRegBitsOn(pDevice->PortOffset, MAC_REG_RCR, RCR_WPAERR);
 
-// Turn On Rx DMA
-MACvReceive0(pDevice->PortOffset);
-MACvReceive1(pDevice->PortOffset);
+       pDevice->eEncryptionStatus = Ndis802_11EncryptionDisabled;
 
-// start the adapter
-MACvStart(pDevice->PortOffset);
+       /* Turn On Rx DMA */
+       MACvReceive0(pDevice->PortOffset);
+       MACvReceive1(pDevice->PortOffset);
 
-netif_stop_queue(pDevice->dev);
+       /* start the adapter */
+       MACvStart(pDevice->PortOffset);
+
+       netif_stop_queue(pDevice->dev);
 }
 
 static void device_init_diversity_timer(PSDevice pDevice)