From 93998817a169c03038635dbbbf884db6f05fa3f2 Mon Sep 17 00:00:00 2001 From: Quytelda Kahja Date: Tue, 22 May 2018 00:26:34 -0700 Subject: [PATCH] staging: rtl8723bs: Fix camel-case in 'struct rt_firmware'. Change the members of 'struct rt_firmware' to be snake case instead of camel-case, per the kernel coding style guide. Signed-off-by: Quytelda Kahja Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 16 ++++++++-------- drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index c877408c..984c8b1 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -425,22 +425,22 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool bUsedWoWLANFw) goto exit; } - pFirmware->szFwBuffer = kmemdup(fw->data, fw->size, GFP_KERNEL); - if (!pFirmware->szFwBuffer) { + pFirmware->fw_buffer_sz = kmemdup(fw->data, fw->size, GFP_KERNEL); + if (!pFirmware->fw_buffer_sz) { rtStatus = _FAIL; goto exit; } - pFirmware->ulFwLength = fw->size; + pFirmware->fw_length = fw->size; release_firmware(fw); - if (pFirmware->ulFwLength > FW_8723B_SIZE) { + if (pFirmware->fw_length > FW_8723B_SIZE) { rtStatus = _FAIL; - DBG_871X_LEVEL(_drv_emerg_, "Firmware size:%u exceed %u\n", pFirmware->ulFwLength, FW_8723B_SIZE); + DBG_871X_LEVEL(_drv_emerg_, "Firmware size:%u exceed %u\n", pFirmware->fw_length, FW_8723B_SIZE); goto release_fw1; } - pFirmwareBuf = pFirmware->szFwBuffer; - FirmwareLen = pFirmware->ulFwLength; + pFirmwareBuf = pFirmware->fw_buffer_sz; + FirmwareLen = pFirmware->fw_length; /* To Check Fw header. Added by tynli. 2009.12.04. */ pFwHdr = (struct rt_firmware_hdr *)pFirmwareBuf; @@ -510,7 +510,7 @@ fwdl_stat: ); exit: - kfree(pFirmware->szFwBuffer); + kfree(pFirmware->fw_buffer_sz); kfree(pFirmware); release_fw1: kfree(pBTFirmware); diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h index b4b54e3..42f467a 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h @@ -47,8 +47,8 @@ ((le16_to_cpu(fw_hdr->Signature) & 0xFFF0) == 0x5300) struct rt_firmware { - u32 ulFwLength; - u8 *szFwBuffer; + u32 fw_length; + u8 *fw_buffer_sz; }; /* This structure must be cared byte-ordering */ -- 2.7.4