mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-10 12:53:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: r8188eu: rename fields of struct rt_firmware

Browse Source 
Rename fields of struct rt_firmware to avoid camel case.

szFwBuffer -> data
ulFwLength -> size

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220107103620.15648-9-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Michael Straube
2022-01-07 11:36:09 +01:00
committed by Greg Kroah-Hartman
parent ca1cb3c278
commit 2f8e84b2d1
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
View File

@@ -530,15 +530,15 @@ static int load_firmware(struct rt_firmware *rtfw, struct device *device)
goto exit;
}
rtfw->szFwBuffer = kzalloc(FW_8188E_SIZE, GFP_KERNEL);
if (!rtfw->szFwBuffer) {
pr_err("Failed to allocate rtfw->szFwBuffer\n");
rtfw->data = kzalloc(FW_8188E_SIZE, GFP_KERNEL);
if (!rtfw->data) {
pr_err("Failed to allocate rtfw->data\n");
ret = _FAIL;
goto exit;
}
memcpy(rtfw->szFwBuffer, fw->data, fw->size);
rtfw->ulFwLength = fw->size;
dev_dbg(device, "!bUsedWoWLANFw, FmrmwareLen:%d+\n", rtfw->ulFwLength);
memcpy(rtfw->data, fw->data, fw->size);
rtfw->size = fw->size;
dev_dbg(device, "!bUsedWoWLANFw, FmrmwareLen:%d+\n", rtfw->size);
exit:
release_firmware(fw);
@@ -558,17 +558,17 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter)
u32 FirmwareLen;
static int log_version;
if (!dvobj->firmware.szFwBuffer)
if (!dvobj->firmware.data)
rtStatus = load_firmware(&dvobj->firmware, device);
if (rtStatus == _FAIL) {
dvobj->firmware.szFwBuffer = NULL;
dvobj->firmware.data = NULL;
goto Exit;
}
pFirmwareBuf = dvobj->firmware.szFwBuffer;
FirmwareLen = dvobj->firmware.ulFwLength;
pFirmwareBuf = dvobj->firmware.data;
FirmwareLen = dvobj->firmware.size;
/* To Check Fw header. Added by tynli. 2009.12.04. */
pFwHdr = (struct rt_firmware_hdr *)dvobj->firmware.szFwBuffer;
pFwHdr = (struct rt_firmware_hdr *)dvobj->firmware.data;
fw_version = le16_to_cpu(pFwHdr->Version);
fw_subversion = pFwHdr->Subversion;

4
drivers/staging/r8188eu/include/drv_types.h
View File

@@ -117,8 +117,8 @@ struct registry_priv {
#define MAX_CONTINUAL_URB_ERR 4
struct rt_firmware {
u8 *szFwBuffer;
u32 ulFwLength;
u8 *data;
u32 size;
};
struct dvobj_priv {

4
drivers/staging/r8188eu/os_dep/os_intfs.c
View File

@@ -789,8 +789,8 @@ int netdev_close(struct net_device *pnetdev)
rtw_p2p_enable(padapter, P2P_ROLE_DISABLE);
kfree(dvobj->firmware.szFwBuffer);
dvobj->firmware.szFwBuffer = NULL;
kfree(dvobj->firmware.data);
dvobj->firmware.data = NULL;
DBG_88E("-88eu_drv - drv_close, bup =%d\n", padapter->bup);
return 0;