staging: rtl8723au: core: fixing "foo * bar" should be "foo *bar"

[firefly-linux-kernel-4.4.55.git] / drivers / staging / rtl8723au / core / rtw_efuse.c

diff --git a/drivers/staging/rtl8723au/core/rtw_efuse.c b/drivers/staging/rtl8723au/core/rtw_efuse.c
index 9f6ce7d071cd3bc4db913238a854c9dacca53cfb..a6deddc02291392017e02ffc8c47fde8d27872cb 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_efuse.c
+++ b/drivers/staging/rtl8723au/core/rtw_efuse.c
@@ -117,12 +117,7 @@ Efuse_GetCurrentSize23a(struct rtw_adapter *pAdapter, u8 efuseType)
 u8
 Efuse_CalculateWordCnts23a(u8 word_en)
 {
-       u8 word_cnts = 0;
-       if (!(word_en & BIT(0)))        word_cnts++; /*  0 : write enable */
-       if (!(word_en & BIT(1)))        word_cnts++;
-       if (!(word_en & BIT(2)))        word_cnts++;
-       if (!(word_en & BIT(3)))        word_cnts++;
-       return word_cnts;
+       return hweight8((~word_en) & 0xf);
 }
 
 /*  */
@@ -181,7 +176,7 @@ EFUSE_GetEfuseDefinition23a(struct rtw_adapter *pAdapter, u8 efuseType,
 
        switch (type) {
        case TYPE_EFUSE_MAX_SECTION:
-               pMax_section = (u8 *) pOut;
+               pMax_section = pOut;
 
                if (efuseType == EFUSE_WIFI)
                        *pMax_section = EFUSE_MAX_SECTION_8723A;
@@ -190,7 +185,7 @@ EFUSE_GetEfuseDefinition23a(struct rtw_adapter *pAdapter, u8 efuseType,
                break;
 
        case TYPE_EFUSE_REAL_CONTENT_LEN:
-               pu2Tmp = (u16 *) pOut;
+               pu2Tmp = pOut;
 
                if (efuseType == EFUSE_WIFI)
                        *pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723A;
@@ -199,7 +194,7 @@ EFUSE_GetEfuseDefinition23a(struct rtw_adapter *pAdapter, u8 efuseType,
                break;
 
        case TYPE_AVAILABLE_EFUSE_BYTES_BANK:
-               pu2Tmp = (u16 *) pOut;
+               pu2Tmp = pOut;
 
                if (efuseType == EFUSE_WIFI)
                        *pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723A -
@@ -210,7 +205,7 @@ EFUSE_GetEfuseDefinition23a(struct rtw_adapter *pAdapter, u8 efuseType,
                break;
 
        case TYPE_AVAILABLE_EFUSE_BYTES_TOTAL:
-               pu2Tmp = (u16 *) pOut;
+               pu2Tmp = pOut;
 
                if (efuseType == EFUSE_WIFI)
                        *pu2Tmp = (EFUSE_REAL_CONTENT_LEN_8723A -
@@ -221,7 +216,7 @@ EFUSE_GetEfuseDefinition23a(struct rtw_adapter *pAdapter, u8 efuseType,
                break;
 
        case TYPE_EFUSE_MAP_LEN:
-               pu2Tmp = (u16 *) pOut;
+               pu2Tmp = pOut;
 
                if (efuseType == EFUSE_WIFI)
                        *pu2Tmp = EFUSE_MAP_LEN_8723A;
@@ -230,7 +225,7 @@ EFUSE_GetEfuseDefinition23a(struct rtw_adapter *pAdapter, u8 efuseType,
                break;
 
        case TYPE_EFUSE_PROTECT_BYTES_BANK:
-               pu1Tmp = (u8 *) pOut;
+               pu1Tmp = pOut;
 
                if (efuseType == EFUSE_WIFI)
                        *pu1Tmp = EFUSE_OOB_PROTECT_BYTES;
@@ -239,7 +234,7 @@ EFUSE_GetEfuseDefinition23a(struct rtw_adapter *pAdapter, u8 efuseType,
                break;
 
        case TYPE_EFUSE_CONTENT_LEN_BANK:
-               pu2Tmp = (u16 *) pOut;
+               pu2Tmp = pOut;
 
                if (efuseType == EFUSE_WIFI)
                        *pu2Tmp = EFUSE_REAL_CONTENT_LEN_8723A;
@@ -248,7 +243,7 @@ EFUSE_GetEfuseDefinition23a(struct rtw_adapter *pAdapter, u8 efuseType,
                break;
 
        default:
-               pu1Tmp = (u8 *) pOut;
+               pu1Tmp = pOut;
                *pu1Tmp = 0;
                break;
        }
@@ -332,15 +327,9 @@ EFUSE_Read1Byte23a(struct rtw_adapter *Adapter, u16 Address)
  *---------------------------------------------------------------------------*/
 
 void
-EFUSE_Write1Byte(
-       struct rtw_adapter *    Adapter,
-       u16             Address,
-       u8              Value);
+EFUSE_Write1Byte(struct rtw_adapter *Adapter, u16 Address, u8 Value);
 void
-EFUSE_Write1Byte(
-       struct rtw_adapter *    Adapter,
-       u16             Address,
-       u8              Value)
+EFUSE_Write1Byte(struct rtw_adapter *Adapter, u16 Address, u8 Value)
 {
        u8      Bytetemp = {0x00};
        u8      temp = {0x00};
@@ -640,10 +629,7 @@ Efuse_ReadAllMap(struct rtw_adapter *pAdapter, u8 efuseType, u8 *Efuse)
  *
  *---------------------------------------------------------------------------*/
 static void
-efuse_ShadowRead1Byte(
-       struct rtw_adapter *    pAdapter,
-       u16             Offset,
-       u8              *Value)
+efuse_ShadowRead1Byte(struct rtw_adapter *pAdapter, u16 Offset, u8 *Value)
 {
        struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
 
@@ -652,10 +638,7 @@ efuse_ShadowRead1Byte(
 
 /* Read Two Bytes */
 static void
-efuse_ShadowRead2Byte(
-       struct rtw_adapter *    pAdapter,
-       u16             Offset,
-       u16             *Value)
+efuse_ShadowRead2Byte(struct rtw_adapter *pAdapter, u16 Offset, u16 *Value)
 {
        struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
 
@@ -665,10 +648,7 @@ efuse_ShadowRead2Byte(
 
 /* Read Four Bytes */
 static void
-efuse_ShadowRead4Byte(
-       struct rtw_adapter *    pAdapter,
-       u16             Offset,
-       u32             *Value)
+efuse_ShadowRead4Byte(struct rtw_adapter *pAdapter, u16 Offset, u32 *Value)
 {
        struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
 
@@ -727,11 +707,8 @@ void EFUSE_ShadowMapUpdate23a(struct rtw_adapter *pAdapter, u8 efuseType)
  *
  *---------------------------------------------------------------------------*/
 void
-EFUSE_ShadowRead23a(
-       struct rtw_adapter *    pAdapter,
-       u8              Type,
-       u16             Offset,
-       u32             *Value)
+EFUSE_ShadowRead23a(struct rtw_adapter *pAdapter,
+                   u8 Type, u16 Offset, u32 *Value)
 {
        if (Type == 1)
                efuse_ShadowRead1Byte(pAdapter, Offset, (u8 *)Value);