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 10/19] staging: r8188eu: rename fw related functions to avoid camel case
Date: Fri, 7 Jan 2022 11:36:11 +0100 [thread overview]
Message-ID: <20220107103620.15648-11-straube.linux@gmail.com> (raw)
In-Reply-To: <20220107103620.15648-1-straube.linux@gmail.com>
Rename firmware related functions to avoid camel case.
rtl8188e_FirmwareDownload -> rtl8188e_firmware_download
_FWDownloadEnable -> fw_download_enable
_8051Reset88E -> rtw_reset_8051
_FWFreeToGo -> fw_free_to_go
_BlockWrite -> block_write
_PageWrite -> page_write
_WriteFW -> write_fw
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
.../staging/r8188eu/hal/rtl8188e_hal_init.c | 34 +++++++++----------
drivers/staging/r8188eu/hal/usb_halinit.c | 2 +-
.../staging/r8188eu/include/rtl8188e_hal.h | 4 +--
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index f7ae2fc0d2b9..b1f2d349c33a 100644
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -21,7 +21,7 @@ static void iol_mode_enable(struct adapter *padapter, u8 enable)
if (!padapter->bFWReady) {
DBG_88E("bFWReady == false call reset 8051...\n");
- _8051Reset88E(padapter);
+ rtw_reset_8051(padapter);
}
} else {
@@ -336,7 +336,7 @@ int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter, struct xmit_frame *xmit
return ret;
}
-static void _FWDownloadEnable(struct adapter *padapter, bool enable)
+static void fw_download_enable(struct adapter *padapter, bool enable)
{
u8 tmp;
@@ -360,7 +360,7 @@ static void _FWDownloadEnable(struct adapter *padapter, bool enable)
#define MAX_REG_BOLCK_SIZE 196
-static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize)
+static int block_write(struct adapter *padapter, void *buffer, u32 buffSize)
{
int ret = _SUCCESS;
u32 blockSize_p1 = 4; /* (Default) Phase #1 : PCI muse use 4-byte write to download FW */
@@ -416,7 +416,7 @@ static int _BlockWrite(struct adapter *padapter, void *buffer, u32 buffSize)
return ret;
}
-static int _PageWrite(struct adapter *padapter, u32 page, void *buffer, u32 size)
+static int page_write(struct adapter *padapter, u32 page, void *buffer, u32 size)
{
u8 value8;
u8 u8Page = (u8)(page & 0x07);
@@ -424,10 +424,10 @@ static int _PageWrite(struct adapter *padapter, u32 page, void *buffer, u32 size
value8 = (rtw_read8(padapter, REG_MCUFWDL + 2) & 0xF8) | u8Page;
rtw_write8(padapter, REG_MCUFWDL + 2, value8);
- return _BlockWrite(padapter, buffer, size);
+ return block_write(padapter, buffer, size);
}
-static int _WriteFW(struct adapter *padapter, void *buffer, u32 size)
+static int write_fw(struct adapter *padapter, void *buffer, u32 size)
{
/* Since we need dynamic decide method of dwonload fw, so we call this function to get chip version. */
/* We can remove _ReadChipVersion from ReadpadapterInfo8192C later. */
@@ -441,7 +441,7 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size)
for (page = 0; page < pageNums; page++) {
offset = page * MAX_PAGE_SIZE;
- ret = _PageWrite(padapter, page, bufferPtr + offset, MAX_PAGE_SIZE);
+ ret = page_write(padapter, page, bufferPtr + offset, MAX_PAGE_SIZE);
if (ret == _FAIL)
goto exit;
@@ -449,7 +449,7 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size)
if (remainSize) {
offset = pageNums * MAX_PAGE_SIZE;
page = pageNums;
- ret = _PageWrite(padapter, page, bufferPtr + offset, remainSize);
+ ret = page_write(padapter, page, bufferPtr + offset, remainSize);
if (ret == _FAIL)
goto exit;
@@ -458,7 +458,7 @@ static int _WriteFW(struct adapter *padapter, void *buffer, u32 size)
return ret;
}
-void _8051Reset88E(struct adapter *padapter)
+void rtw_reset_8051(struct adapter *padapter)
{
u8 u1bTmp;
@@ -468,7 +468,7 @@ void _8051Reset88E(struct adapter *padapter)
DBG_88E("=====> _8051Reset88E(): 8051 reset success .\n");
}
-static s32 _FWFreeToGo(struct adapter *padapter)
+static s32 fw_free_to_go(struct adapter *padapter)
{
u32 counter = 0;
u32 value32;
@@ -491,7 +491,7 @@ static s32 _FWFreeToGo(struct adapter *padapter)
value32 &= ~WINTINI_RDY;
rtw_write32(padapter, REG_MCUFWDL, value32);
- _8051Reset88E(padapter);
+ rtw_reset_8051(padapter);
/* polling for FW ready */
counter = 0;
@@ -540,7 +540,7 @@ static int load_firmware(struct rt_firmware *rtfw, struct device *device)
return ret;
}
-s32 rtl8188e_FirmwareDownload(struct adapter *padapter)
+s32 rtl8188e_firmware_download(struct adapter *padapter)
{
s32 rtStatus = _SUCCESS;
u8 writeFW_retry = 0;
@@ -583,16 +583,16 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter)
/* or it will cause download Fw fail. 2010.02.01. by tynli. */
if (rtw_read8(padapter, REG_MCUFWDL) & RAM_DL_SEL) { /* 8051 RAM code */
rtw_write8(padapter, REG_MCUFWDL, 0x00);
- _8051Reset88E(padapter);
+ rtw_reset_8051(padapter);
}
- _FWDownloadEnable(padapter, true);
+ fw_download_enable(padapter, true);
fwdl_start_time = jiffies;
while (1) {
/* reset the FWDL chksum */
rtw_write8(padapter, REG_MCUFWDL, rtw_read8(padapter, REG_MCUFWDL) | FWDL_ChkSum_rpt);
- rtStatus = _WriteFW(padapter, pFirmwareBuf, FirmwareLen);
+ rtStatus = write_fw(padapter, pFirmwareBuf, FirmwareLen);
if (rtStatus == _SUCCESS ||
(rtw_get_passing_time_ms(fwdl_start_time) > 500 && writeFW_retry++ >= 3))
@@ -602,13 +602,13 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter)
__func__, writeFW_retry, rtw_get_passing_time_ms(fwdl_start_time)
);
}
- _FWDownloadEnable(padapter, false);
+ fw_download_enable(padapter, false);
if (_SUCCESS != rtStatus) {
DBG_88E("DL Firmware failed!\n");
goto Exit;
}
- rtStatus = _FWFreeToGo(padapter);
+ rtStatus = fw_free_to_go(padapter);
if (_SUCCESS != rtStatus) {
DBG_88E("DL Firmware failed!\n");
goto Exit;
diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 696beb29536f..3dc1c432e8cf 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -625,7 +625,7 @@ u32 rtl8188eu_hal_init(struct adapter *Adapter)
_InitTxBufferBoundary(Adapter, 0);
- status = rtl8188e_FirmwareDownload(Adapter);
+ status = rtl8188e_firmware_download(Adapter);
if (status != _SUCCESS) {
DBG_88E("%s: Download Firmware failed!!\n", __func__);
diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 051f3b9fe726..11d79606e120 100644
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -250,8 +250,8 @@ struct hal_data_8188e {
};
/* rtl8188e_hal_init.c */
-s32 rtl8188e_FirmwareDownload(struct adapter *padapter);
-void _8051Reset88E(struct adapter *padapter);
+s32 rtl8188e_firmware_download(struct adapter *padapter);
+void rtw_reset_8051(struct adapter *padapter);
s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy);
--
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 ` Michael Straube [this message]
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 ` [PATCH 14/19] staging: r8188eu: rename rtSatus " Michael Straube
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-11-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.