staging: r8188eu: clean up long lines in block_write()
authorMichael Straube <straube.linux@gmail.com>
Tue, 12 Apr 2022 18:57:54 +0000 (20:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Apr 2022 06:55:54 +0000 (08:55 +0200)
Store the address and the data pointer for calls to rtw_writeN() and
rtw_write8() in local variables. This avoids long lines and improves
readability.

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

index 1e93079..8620f3c 100644 (file)
@@ -75,7 +75,8 @@ static int block_write(struct adapter *padapter, u8 *buffer, u32 size)
 {
        int ret = _SUCCESS;
        u32 blocks, block_size, remain;
-       u32 i, offset;
+       u32 i, offset, addr;
+       u8 *data;
 
        block_size = MAX_REG_BLOCK_SIZE;
 
@@ -83,7 +84,10 @@ static int block_write(struct adapter *padapter, u8 *buffer, u32 size)
        remain = size % block_size;
 
        for (i = 0; i < blocks; i++) {
-               ret = rtw_writeN(padapter, (FW_8188E_START_ADDRESS + i * block_size), block_size, (buffer + i * block_size));
+               addr = FW_8188E_START_ADDRESS + i * block_size;
+               data = buffer + i * block_size;
+
+               ret = rtw_writeN(padapter, addr, block_size, data);
                if (ret == _FAIL)
                        goto exit;
        }
@@ -96,7 +100,10 @@ static int block_write(struct adapter *padapter, u8 *buffer, u32 size)
                remain = remain % block_size;
 
                for (i = 0; i < blocks; i++) {
-                       ret = rtw_writeN(padapter, (FW_8188E_START_ADDRESS + offset + i * block_size), block_size, (buffer + offset + i * block_size));
+                       addr = FW_8188E_START_ADDRESS + offset + i * block_size;
+                       data = buffer + offset + i * block_size;
+
+                       ret = rtw_writeN(padapter, addr, block_size, data);
                        if (ret == _FAIL)
                                goto exit;
                }
@@ -109,7 +116,10 @@ static int block_write(struct adapter *padapter, u8 *buffer, u32 size)
                blocks = remain;
 
                for (i = 0; i < blocks; i++) {
-                       ret = rtw_write8(padapter, (FW_8188E_START_ADDRESS + offset + i), *(buffer + offset + i));
+                       addr = FW_8188E_START_ADDRESS + offset + i;
+                       data = buffer + offset + i;
+
+                       ret = rtw_write8(padapter, addr, *data);
                        if (ret == _FAIL)
                                goto exit;
                }