From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH 6/6] staging: r8188eu: clean up long lines in block_write()
Date: Tue, 12 Apr 2022 20:57:54 +0200 [thread overview]
Message-ID: <20220412185754.8695-7-straube.linux@gmail.com> (raw)
In-Reply-To: <20220412185754.8695-1-straube.linux@gmail.com>
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>
---
drivers/staging/r8188eu/core/rtw_fw.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188eu/core/rtw_fw.c
index 1e930799a0b3..8620f3c92b52 100644
--- a/drivers/staging/r8188eu/core/rtw_fw.c
+++ b/drivers/staging/r8188eu/core/rtw_fw.c
@@ -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;
}
--
2.35.1
prev parent reply other threads:[~2022-04-12 18:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-12 18:57 [PATCH 0/6] staging: r8188eu: clean up block_write() in rtw_fw.c Michael Straube
2022-04-12 18:57 ` [PATCH 1/6] staging: r8188eu: correct macro spelling mistake Michael Straube
2022-04-12 18:57 ` [PATCH 2/6] staging: r8188eu: rename parameter of block_write() Michael Straube
2022-04-13 6:53 ` Greg KH
2022-04-13 6:54 ` Greg KH
2022-04-12 18:57 ` [PATCH 3/6] staging: r8188eu: change void parameters to u8 Michael Straube
2022-04-12 18:57 ` [PATCH 4/6] staging: r8188eu: reduce variables in block_write() Michael Straube
2022-04-12 18:57 ` [PATCH 5/6] staging: r8188eu: remove unneeded initializations Michael Straube
2022-04-12 18:57 ` Michael Straube [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220412185754.8695-7-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.