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 14/19] staging: r8188eu: rename rtSatus in rtl8188e_firmware_download()
Date: Fri, 7 Jan 2022 11:36:15 +0100 [thread overview]
Message-ID: <20220107103620.15648-15-straube.linux@gmail.com> (raw)
In-Reply-To: <20220107103620.15648-1-straube.linux@gmail.com>
Rename the variable rtStatus in rtl8188e_firmware_download() to avoid
camel case.
rtStatus -> ret
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
.../staging/r8188eu/hal/rtl8188e_hal_init.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index f158bbf44094..1685386a7015 100644
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -541,7 +541,7 @@ static int load_firmware(struct rt_firmware *rtfw, struct device *device)
int rtl8188e_firmware_download(struct adapter *padapter)
{
- int rtStatus = _SUCCESS;
+ int ret = _SUCCESS;
u8 writeFW_retry = 0;
u32 fwdl_start_time;
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
@@ -553,8 +553,8 @@ int rtl8188e_firmware_download(struct adapter *padapter)
static int log_version;
if (!dvobj->firmware.data)
- rtStatus = load_firmware(&dvobj->firmware, device);
- if (rtStatus == _FAIL) {
+ ret = load_firmware(&dvobj->firmware, device);
+ if (ret == _FAIL) {
dvobj->firmware.data = NULL;
goto exit;
}
@@ -591,9 +591,9 @@ int rtl8188e_firmware_download(struct adapter *padapter)
/* reset the FWDL chksum */
rtw_write8(padapter, REG_MCUFWDL, rtw_read8(padapter, REG_MCUFWDL) | FWDL_ChkSum_rpt);
- rtStatus = write_fw(padapter, pFirmwareBuf, FirmwareLen);
+ ret = write_fw(padapter, pFirmwareBuf, FirmwareLen);
- if (rtStatus == _SUCCESS ||
+ if (ret == _SUCCESS ||
(rtw_get_passing_time_ms(fwdl_start_time) > 500 && writeFW_retry++ >= 3))
break;
@@ -602,19 +602,19 @@ int rtl8188e_firmware_download(struct adapter *padapter)
);
}
fw_download_enable(padapter, false);
- if (_SUCCESS != rtStatus) {
+ if (ret != _SUCCESS) {
DBG_88E("DL Firmware failed!\n");
goto exit;
}
- rtStatus = fw_free_to_go(padapter);
- if (_SUCCESS != rtStatus) {
+ ret = fw_free_to_go(padapter);
+ if (ret != _SUCCESS) {
DBG_88E("DL Firmware failed!\n");
goto exit;
}
exit:
- return rtStatus;
+ return ret;
}
/* */
--
2.34.1
next prev parent reply other threads:[~2022-01-07 10:36 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-07 10:36 [PATCH 00/19] staging: r8188eu: move firmware loading out of the hal layer Michael Straube
2022-01-07 10:36 ` [PATCH 01/19] staging: r8188eu: remove Firmware* from struct hal_data_8188e Michael Straube
2022-01-07 10:36 ` [PATCH 02/19] staging: r8188eu: remove rtl8188e_InitializeFirmwareVars() Michael Straube
2022-01-07 10:36 ` [PATCH 03/19] staging: r8188eu: release_firmware is not called if allocation fails Michael Straube
2022-01-07 11:15 ` Pavel Skripkin
2022-01-07 11:25 ` Greg KH
2022-01-07 11:26 ` Pavel Skripkin
2022-01-07 10:36 ` [PATCH 04/19] staging: r8188eu: rename Exit label in load_firmware() Michael Straube
2022-01-07 10:36 ` [PATCH 05/19] staging: r8188eu: rename rtStatus " Michael Straube
2022-01-07 10:36 ` [PATCH 06/19] staging: r8188eu: convert type of return variable " Michael Straube
2022-01-07 10:36 ` [PATCH 07/19] staging: r8188eu: rename parameter pFirmware of load_firmware() Michael Straube
2022-01-07 10:36 ` [PATCH 08/19] staging: r8188eu: rename fields of struct rt_firmware Michael Straube
2022-01-07 10:36 ` [PATCH 09/19] staging: r8188eu: use kmemdup instead of kzalloc and memcpy Michael Straube
2022-01-07 10:36 ` [PATCH 10/19] staging: r8188eu: rename fw related functions to avoid camel case Michael Straube
2022-01-07 10:36 ` [PATCH 11/19] staging: r8188eu: clean up rtw_reset_8051() Michael Straube
2022-01-07 10:36 ` [PATCH 12/19] staging: r8188eu: convert two functions from s32 to int Michael Straube
2022-01-07 10:36 ` [PATCH 13/19] staging: r8188eu: rename Exit label in rtl8188e_firmware_download() Michael Straube
2022-01-07 10:36 ` Michael Straube [this message]
2022-01-07 10:36 ` [PATCH 15/19] staging: r8188eu: rename FWDL_ChkSum_rpt Michael Straube
2022-01-07 10:36 ` [PATCH 16/19] staging: r8188eu: rename writeFW_retry Michael Straube
2022-01-07 10:36 ` [PATCH 17/19] staging: r8188eu: rename pFwHdr in rtl8188e_firmware_download() Michael Straube
2022-01-07 10:36 ` [PATCH 18/19] staging: r8188eu: rename pFirmwareBuf and FirmwareLen Michael Straube
2022-01-07 10:36 ` [PATCH 19/19] staging: r8188eu: move firmware loading code out of the hal layer Michael Straube
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=20220107103620.15648-15-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.