staging: rtl8192su: remove re-declaration of counter i

variable i is declared integer in rtl8192SU_ConfigAdapterInfo8192SForAutoLoadFail.
a few lines down it is re-declared u8.
removed the re-declaration.
plus cosmetics

Signed-off-by: Florian Schilhabel <florian.c.schilhabel@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c
index 791cd51cfdd01c2820d07d350dd7bdc422579fdb..6a87a43dfc5ea1f3f3f8822062e8a98fa1df0b75 100644 (file)
--- a/drivers/staging/rtl8192su/r8192U_core.c
+++ b/drivers/staging/rtl8192su/r8192U_core.c
@@ -3427,34 +3427,28 @@ void update_hal_variables(struct r8192_priv *priv)
        }
 }
 
-//
-//     Description:
-//             Config HW adapter information into initial value.
-//
-//     Assumption:
-//             1. After Auto load fail(i.e, check CR9346 fail)
-//
-//     Created by Roger, 2008.10.21.
-//
-void
-rtl8192SU_ConfigAdapterInfo8192SForAutoLoadFail(struct net_device* dev)
+/*
+ * Description:
+ *     Config HW adapter information into initial value.
+ *
+ *     Assumption:
+ *             1. After Auto load fail(i.e, check CR9346 fail)
+ *
+ */
+void rtl8192SU_ConfigAdapterInfo8192SForAutoLoadFail(struct net_device *dev)
 {
-       struct r8192_priv       *priv = ieee80211_priv(dev);
-       //u16                   i,usValue;
-       //u8 sMacAddr[6] = {0x00, 0xE0, 0x4C, 0x81, 0x92, 0x00};
-       u8              rf_path;        // For EEPROM/EFUSE After V0.6_1117
-       int     i;
+       struct r8192_priv *priv = ieee80211_priv(dev);
+       u8 rf_path;     /* For EEPROM/EFUSE After V0.6_1117 */
+       int i;
 
        RT_TRACE(COMP_INIT, "====> ConfigAdapterInfo8192SForAutoLoadFail\n");
 
-       write_nic_byte(dev, SYS_ISO_CTRL+1, 0xE8); // Isolation signals from Loader
-       //PlatformStallExecution(10000);
+       /* Isolation signals from Loader */
+       write_nic_byte(dev, SYS_ISO_CTRL+1, 0xE8);
        mdelay(10);
-       write_nic_byte(dev, PMC_FSM, 0x02); // Enable Loader Data Keep
-
-       //RT_ASSERT(priv->AutoloadFailFlag==TRUE, ("ReadAdapterInfo8192SEEPROM(): AutoloadFailFlag !=TRUE\n"));
+       write_nic_byte(dev, PMC_FSM, 0x02); /* Enable Loader Data Keep */
 
-       // Initialize IC Version && Channel Plan
+       /* Initialize IC Version && Channel Plan */
        priv->eeprom_vid = 0;
        priv->eeprom_pid = 0;
        priv->card_8192_version = 0;
@@ -3465,12 +3459,14 @@ rtl8192SU_ConfigAdapterInfo8192SForAutoLoadFail(struct net_device* dev)
 
        RT_TRACE(COMP_INIT, "EEPROM VID = 0x%4x\n", priv->eeprom_vid);
        RT_TRACE(COMP_INIT, "EEPROM PID = 0x%4x\n", priv->eeprom_pid);
-       RT_TRACE(COMP_INIT, "EEPROM Customer ID: 0x%2x\n", priv->eeprom_CustomerID);
-       RT_TRACE(COMP_INIT, "EEPROM SubCustomer ID: 0x%2x\n", priv->eeprom_SubCustomerID);
-       RT_TRACE(COMP_INIT, "EEPROM ChannelPlan = 0x%4x\n", priv->eeprom_ChannelPlan);
-       RT_TRACE(COMP_INIT, "IgnoreDiffRateTxPowerOffset = %d\n", priv->bIgnoreDiffRateTxPowerOffset);
-
-
+       RT_TRACE(COMP_INIT, "EEPROM Customer ID: 0x%2x\n",
+                                       priv->eeprom_CustomerID);
+       RT_TRACE(COMP_INIT, "EEPROM SubCustomer ID: 0x%2x\n",
+                                       priv->eeprom_SubCustomerID);
+       RT_TRACE(COMP_INIT, "EEPROM ChannelPlan = 0x%4x\n",
+                                       priv->eeprom_ChannelPlan);
+       RT_TRACE(COMP_INIT, "IgnoreDiffRateTxPowerOffset = %d\n",
+                                       priv->bIgnoreDiffRateTxPowerOffset);
 
        priv->EEPROMUsbOption = EEPROM_USB_Default_OPTIONAL_FUNC;
        RT_TRACE(COMP_INIT, "USB Option = %#x\n", priv->EEPROMUsbOption);
@@ -3478,19 +3474,15 @@ rtl8192SU_ConfigAdapterInfo8192SForAutoLoadFail(struct net_device* dev)
        for(i=0; i<5; i++)
                priv->EEPROMUsbPhyParam[i] = EEPROM_USB_Default_PHY_PARAM;
 
-       //RT_PRINT_DATA(COMP_INIT|COMP_EFUSE, DBG_LOUD, ("EFUSE USB PHY Param: \n"), priv->EEPROMUsbPhyParam, 5);
-
        {
-       //<Roger_Notes> In this case, we random assigh MAC address here. 2008.10.15.
+       /*
+        * In this case, we randomly assign a MAC address here.
+        */
                static u8 sMacAddr[6] = {0x00, 0xE0, 0x4C, 0x81, 0x92, 0x00};
-               u8      i;
-
-               //sMacAddr[5] = (u8)GetRandomNumber(1, 254);
-
                for(i = 0; i < 6; i++)
                        dev->dev_addr[i] = sMacAddr[i];
        }
-       //NicIFSetMacAddress(Adapter, Adapter->PermanentAddress);
+       /* NicIFSetMacAddress(Adapter, Adapter->PermanentAddress); */
        write_nic_dword(dev, IDR0, ((u32*)dev->dev_addr)[0]);
        write_nic_word(dev, IDR4, ((u16*)(dev->dev_addr + 4))[0]);
 
@@ -3499,7 +3491,7 @@ rtl8192SU_ConfigAdapterInfo8192SForAutoLoadFail(struct net_device* dev)
                dev->dev_addr);
 
        priv->EEPROMBoardType = EEPROM_Default_BoardType;
-       priv->rf_type = RF_1T2R; //RF_2T2R
+       priv->rf_type = RF_1T2R; /* RF_2T2R */
        priv->EEPROMTxPowerDiff = EEPROM_Default_PwDiff;
        priv->EEPROMThermalMeter = EEPROM_Default_ThermalMeter;
        priv->EEPROMCrystalCap = EEPROM_Default_CrystalCap;
@@ -3508,13 +3500,11 @@ rtl8192SU_ConfigAdapterInfo8192SForAutoLoadFail(struct net_device* dev)
        priv->EEPROMTSSI_B = EEPROM_Default_TSSI;
        priv->EEPROMTxPwrTkMode = EEPROM_Default_TxPwrTkMode;
 
-
-
        for (rf_path = 0; rf_path < 2; rf_path++)
        {
                for (i = 0; i < 3; i++)
                {
-                       // Read CCK RF A & B Tx power
+                       /* Read CCK RF A & B Tx power */
                        priv->RfCckChnlAreaTxPwr[rf_path][i] =
                        priv->RfOfdmChnlAreaTxPwr1T[rf_path][i] =
                        priv->RfOfdmChnlAreaTxPwr2T[rf_path][i] =
@@ -3524,22 +3514,25 @@ rtl8192SU_ConfigAdapterInfo8192SForAutoLoadFail(struct net_device* dev)
 
        update_hal_variables(priv);
 
-       //
-       // Update remained HAL variables.
-       //
+       /*
+        * Update remaining HAL variables.
+        */
        priv->TSSI_13dBm = priv->EEPROMThermalMeter *100;
-       priv->LegacyHTTxPowerDiff = priv->EEPROMTxPowerDiff;//new
+       priv->LegacyHTTxPowerDiff = priv->EEPROMTxPowerDiff; /* new */
        priv->TxPowerDiff = priv->EEPROMTxPowerDiff;
-       //priv->AntennaTxPwDiff[0] = (priv->EEPROMTxPowerDiff & 0xf);// Antenna B gain offset to antenna A, bit0~3
-       //priv->AntennaTxPwDiff[1] = ((priv->EEPROMTxPowerDiff & 0xf0)>>4);// Antenna C gain offset to antenna A, bit4~7
-       priv->CrystalCap = priv->EEPROMCrystalCap;      // CrystalCap, bit12~15
-       priv->ThermalMeter[0] = priv->EEPROMThermalMeter;// ThermalMeter, bit0~3 for RFIC1, bit4~7 for RFIC2
+       /* Antenna B gain offset to antenna A, bit0~3 */
+       /* priv->AntennaTxPwDiff[0] = (priv->EEPROMTxPowerDiff & 0xf); */
+       /* Antenna C gain offset to antenna A, bit4~7 */
+       /* priv->AntennaTxPwDiff[1] = ((priv->EEPROMTxPowerDiff & 0xf0)>>4); */
+       /* CrystalCap, bit12~15 */
+       priv->CrystalCap = priv->EEPROMCrystalCap;
+       /* ThermalMeter, bit0~3 for RFIC1, bit4~7 for RFIC2 */
+       priv->ThermalMeter[0] = priv->EEPROMThermalMeter;
        priv->LedStrategy = SW_LED_MODE0;
 
        init_rate_adaptive(dev);
 
        RT_TRACE(COMP_INIT, "<==== ConfigAdapterInfo8192SForAutoLoadFail\n");
-
 }
 
 //