staging: r8188eu: clean up spacing style issues in core/rtw_efuse.c
authorMichael Straube <straube.linux@gmail.com>
Mon, 16 Aug 2021 15:58:00 +0000 (17:58 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Aug 2021 17:56:04 +0000 (19:56 +0200)
Clean up spacing style issues in core/rtw_efuse.c reported by checkpatch.

CHECK: spaces preferred around that ...
WARNING: space prohibited before semicolon

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210816155818.24005-6-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_efuse.c

index 6e790f5..decccf7 100644 (file)
@@ -46,7 +46,7 @@ Efuse_Read1ByteFromFakeContent(
        if (fakeEfuseBank == 0)
                *Value = fakeEfuseContent[Offset];
        else
-               *Value = fakeBTEfuseContent[fakeEfuseBank-1][Offset];
+               *Value = fakeBTEfuseContent[fakeEfuseBank - 1][Offset];
        return true;
 }
 
@@ -61,7 +61,7 @@ Efuse_Write1ByteToFakeContent(
        if (fakeEfuseBank == 0) {
                fakeEfuseContent[Offset] = Value;
        } else {
-               fakeBTEfuseContent[fakeEfuseBank-1][Offset] = Value;
+               fakeBTEfuseContent[fakeEfuseBank - 1][Offset] = Value;
        }
        return true;
 }
@@ -166,13 +166,13 @@ ReadEFuseByte(
        }
 
        /* Write Address */
-       rtw_write8(Adapter, EFUSE_CTRL+1, (_offset & 0xff));
-       readbyte = rtw_read8(Adapter, EFUSE_CTRL+2);
-       rtw_write8(Adapter, EFUSE_CTRL+2, ((_offset >> 8) & 0x03) | (readbyte & 0xfc));
+       rtw_write8(Adapter, EFUSE_CTRL + 1, (_offset & 0xff));
+       readbyte = rtw_read8(Adapter, EFUSE_CTRL + 2);
+       rtw_write8(Adapter, EFUSE_CTRL + 2, ((_offset >> 8) & 0x03) | (readbyte & 0xfc));
 
        /* Write bit 32 0 */
-       readbyte = rtw_read8(Adapter, EFUSE_CTRL+3);
-       rtw_write8(Adapter, EFUSE_CTRL+3, (readbyte & 0x7f));
+       readbyte = rtw_read8(Adapter, EFUSE_CTRL + 3);
+       rtw_write8(Adapter, EFUSE_CTRL + 3, (readbyte & 0x7f));
 
        /* Check bit 32 read-ready */
        retry = 0;
@@ -250,21 +250,21 @@ u8 EFUSE_Read1Byte(struct adapter *Adapter, u16 Address)
        if (Address < contentLen) {     /* E-fuse 512Byte */
                /* Write E-fuse Register address bit0~7 */
                temp = Address & 0xFF;
-               rtw_write8(Adapter, EFUSE_CTRL+1, temp);
-               Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+2);
+               rtw_write8(Adapter, EFUSE_CTRL + 1, temp);
+               Bytetemp = rtw_read8(Adapter, EFUSE_CTRL + 2);
                /* Write E-fuse Register address bit8~9 */
                temp = ((Address >> 8) & 0x03) | (Bytetemp & 0xFC);
-               rtw_write8(Adapter, EFUSE_CTRL+2, temp);
+               rtw_write8(Adapter, EFUSE_CTRL + 2, temp);
 
                /* Write 0x30[31]= 0 */
-               Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);
+               Bytetemp = rtw_read8(Adapter, EFUSE_CTRL + 3);
                temp = Bytetemp & 0x7F;
-               rtw_write8(Adapter, EFUSE_CTRL+3, temp);
+               rtw_write8(Adapter, EFUSE_CTRL + 3, temp);
 
                /* Wait Write-ready (0x30[31]= 1) */
-               Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);
+               Bytetemp = rtw_read8(Adapter, EFUSE_CTRL + 3);
                while (!(Bytetemp & 0x80)) {
-                       Bytetemp = rtw_read8(Adapter, EFUSE_CTRL+3);
+                       Bytetemp = rtw_read8(Adapter, EFUSE_CTRL + 3);
                        k++;
                        if (k == 1000) {
                                k = 0;
@@ -291,13 +291,13 @@ u8 efuse_OneByteRead(struct adapter *pAdapter, u16 addr, u8 *data, bool pseudo)
        }
        /*  -----------------e-fuse reg ctrl --------------------------------- */
        /* address */
-       rtw_write8(pAdapter, EFUSE_CTRL+1, (u8)(addr & 0xff));
-       rtw_write8(pAdapter, EFUSE_CTRL+2, ((u8)((addr>>8) & 0x03)) |
-                  (rtw_read8(pAdapter, EFUSE_CTRL+2) & 0xFC));
+       rtw_write8(pAdapter, EFUSE_CTRL + 1, (u8)(addr & 0xff));
+       rtw_write8(pAdapter, EFUSE_CTRL + 2, ((u8)((addr >> 8) & 0x03)) |
+                  (rtw_read8(pAdapter, EFUSE_CTRL + 2) & 0xFC));
 
-       rtw_write8(pAdapter, EFUSE_CTRL+3,  0x72);/* read cmd */
+       rtw_write8(pAdapter, EFUSE_CTRL + 3,  0x72);/* read cmd */
 
-       while (!(0x80 & rtw_read8(pAdapter, EFUSE_CTRL+3)) && (tmpidx < 100))
+       while (!(0x80 & rtw_read8(pAdapter, EFUSE_CTRL + 3)) && (tmpidx < 100))
                tmpidx++;
        if (tmpidx < 100) {
                *data = rtw_read8(pAdapter, EFUSE_CTRL);
@@ -322,15 +322,15 @@ u8 efuse_OneByteWrite(struct adapter *pAdapter, u16 addr, u8 data, bool pseudo)
 
        /*  -----------------e-fuse reg ctrl --------------------------------- */
        /* address */
-       rtw_write8(pAdapter, EFUSE_CTRL+1, (u8)(addr&0xff));
-       rtw_write8(pAdapter, EFUSE_CTRL+2,
-                  (rtw_read8(pAdapter, EFUSE_CTRL+2) & 0xFC) |
-                  (u8)((addr>>8) & 0x03));
+       rtw_write8(pAdapter, EFUSE_CTRL + 1, (u8)(addr & 0xff));
+       rtw_write8(pAdapter, EFUSE_CTRL + 2,
+                  (rtw_read8(pAdapter, EFUSE_CTRL + 2) & 0xFC) |
+                  (u8)((addr >> 8) & 0x03));
        rtw_write8(pAdapter, EFUSE_CTRL, data);/* data */
 
-       rtw_write8(pAdapter, EFUSE_CTRL+3, 0xF2);/* write cmd */
+       rtw_write8(pAdapter, EFUSE_CTRL + 3, 0xF2);/* write cmd */
 
-       while ((0x80 &  rtw_read8(pAdapter, EFUSE_CTRL+3)) && (tmpidx < 100))
+       while ((0x80 &  rtw_read8(pAdapter, EFUSE_CTRL + 3)) && (tmpidx < 100))
                tmpidx++;
 
        if (tmpidx < 100)
@@ -387,19 +387,19 @@ static int Efuse_PgPacketWrite_BT(struct adapter *pAdapter, u8 offset, u8 word_e
  *---------------------------------------------------------------------------*/
 void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata)
 {
-       if (!(word_en&BIT(0))) {
+       if (!(word_en & BIT(0))) {
                targetdata[0] = sourdata[0];
                targetdata[1] = sourdata[1];
        }
-       if (!(word_en&BIT(1))) {
+       if (!(word_en & BIT(1))) {
                targetdata[2] = sourdata[2];
                targetdata[3] = sourdata[3];
        }
-       if (!(word_en&BIT(2))) {
+       if (!(word_en & BIT(2))) {
                targetdata[4] = sourdata[4];
                targetdata[5] = sourdata[5];
        }
-       if (!(word_en&BIT(3))) {
+       if (!(word_en & BIT(3))) {
                targetdata[6] = sourdata[6];
                targetdata[7] = sourdata[7];
        }
@@ -431,7 +431,7 @@ u8 rtw_efuse_access(struct adapter *padapter, u8 write, u16 start_addr, u16 cnts
 {
        int i = 0;
        u16 real_content_len = 0, max_available_size = 0;
-       u8 res = _FAIL ;
+       u8 res = _FAIL;
        u8 (*rw8)(struct adapter *, u16, u8*);
 
        EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_EFUSE_REAL_CONTENT_LEN, (void *)&real_content_len, false);
@@ -551,9 +551,9 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data)
 
        if (i & 0x1) {
                /*  odd start */
-               if (data[idx] != map[addr+idx]) {
+               if (data[idx] != map[addr + idx]) {
                        word_en &= ~BIT(i >> 1);
-                       newdata[i-1] = map[addr+idx-1];
+                       newdata[i - 1] = map[addr + idx - 1];
                        newdata[i] = data[idx];
                }
                i++;
@@ -564,19 +564,19 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data)
                        if (cnts == idx)
                                break;
                        if ((cnts - idx) == 1) {
-                               if (data[idx] != map[addr+idx]) {
+                               if (data[idx] != map[addr + idx]) {
                                        word_en &= ~BIT(i >> 1);
                                        newdata[i] = data[idx];
-                                       newdata[i+1] = map[addr+idx+1];
+                                       newdata[i + 1] = map[addr + idx + 1];
                                }
                                idx++;
                                break;
                        } else {
-                               if ((data[idx] != map[addr+idx]) ||
-                                   (data[idx+1] != map[addr+idx+1])) {
+                               if ((data[idx] != map[addr + idx]) ||
+                                   (data[idx + 1] != map[addr + idx + 1])) {
                                        word_en &= ~BIT(i >> 1);
                                        newdata[i] = data[idx];
-                                       newdata[i+1] = data[idx + 1];
+                                       newdata[i + 1] = data[idx + 1];
                                }
                                idx += 2;
                        }
@@ -643,9 +643,9 @@ u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data
 
        if (i & 0x1) {
                /*  odd start */
-               if (data[idx] != map[addr+idx]) {
+               if (data[idx] != map[addr + idx]) {
                        word_en &= ~BIT(i >> 1);
-                       newdata[i-1] = map[addr+idx-1];
+                       newdata[i - 1] = map[addr + idx - 1];
                        newdata[i] = data[idx];
                }
                i++;
@@ -656,19 +656,19 @@ u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data
                        if (cnts == idx)
                                break;
                        if ((cnts - idx) == 1) {
-                               if (data[idx] != map[addr+idx]) {
+                               if (data[idx] != map[addr + idx]) {
                                        word_en &= ~BIT(i >> 1);
                                        newdata[i] = data[idx];
-                                       newdata[i+1] = map[addr+idx+1];
+                                       newdata[i + 1] = map[addr + idx + 1];
                                }
                                idx++;
                                break;
                        } else {
-                               if ((data[idx] != map[addr+idx]) ||
-                                   (data[idx+1] != map[addr+idx+1])) {
+                               if ((data[idx] != map[addr + idx]) ||
+                                   (data[idx + 1] != map[addr + idx + 1])) {
                                        word_en &= ~BIT(i >> 1);
                                        newdata[i] = data[idx];
-                                       newdata[i+1] = data[idx + 1];
+                                       newdata[i + 1] = data[idx + 1];
                                }
                                idx += 2;
                        }
@@ -747,7 +747,7 @@ efuse_ShadowRead2Byte(
        struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
 
        *Value = pEEPROM->efuse_eeprom_data[Offset];
-       *Value |= pEEPROM->efuse_eeprom_data[Offset+1]<<8;
+       *Value |= pEEPROM->efuse_eeprom_data[Offset + 1] << 8;
 
 }      /*  EFUSE_ShadowRead2Byte */
 
@@ -761,9 +761,9 @@ efuse_ShadowRead4Byte(
        struct eeprom_priv *pEEPROM = GET_EEPROM_EFUSE_PRIV(pAdapter);
 
        *Value = pEEPROM->efuse_eeprom_data[Offset];
-       *Value |= pEEPROM->efuse_eeprom_data[Offset+1]<<8;
-       *Value |= pEEPROM->efuse_eeprom_data[Offset+2]<<16;
-       *Value |= pEEPROM->efuse_eeprom_data[Offset+3]<<24;
+       *Value |= pEEPROM->efuse_eeprom_data[Offset + 1] << 8;
+       *Value |= pEEPROM->efuse_eeprom_data[Offset + 2] << 16;
+       *Value |= pEEPROM->efuse_eeprom_data[Offset + 3] << 24;
 
 }      /*  efuse_ShadowRead4Byte */