From 699ad73456d6c970e3ce1e2225f11ad192ef8495 Mon Sep 17 00:00:00 2001 From: Quytelda Kahja Date: Tue, 22 May 2018 00:26:36 -0700 Subject: [PATCH] staging: rtl8723bs: Fix camel-case in 'struct rt_firmware_hdr'. Replace camel-case member names with snake-case names per the linux kernel coding style guidelines. Signed-off-by: Quytelda Kahja Signed-off-by: Greg Kroah-Hartman --- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 14 ++++---- .../staging/rtl8723bs/include/rtl8723b_hal.h | 32 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index 984c8b181fd4..592917fc00aa 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -445,9 +445,9 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool bUsedWoWLANFw) /* To Check Fw header. Added by tynli. 2009.12.04. */ pFwHdr = (struct rt_firmware_hdr *)pFirmwareBuf; - pHalData->FirmwareVersion = le16_to_cpu(pFwHdr->Version); - pHalData->FirmwareSubVersion = le16_to_cpu(pFwHdr->Subversion); - pHalData->FirmwareSignature = le16_to_cpu(pFwHdr->Signature); + pHalData->FirmwareVersion = le16_to_cpu(pFwHdr->version); + pHalData->FirmwareSubVersion = le16_to_cpu(pFwHdr->subversion); + pHalData->FirmwareSignature = le16_to_cpu(pFwHdr->signature); DBG_871X( "%s: fw_ver =%x fw_subver =%04x sig = 0x%x, Month =%02x, Date =%02x, Hour =%02x, Minute =%02x\n", @@ -455,10 +455,10 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool bUsedWoWLANFw) pHalData->FirmwareVersion, pHalData->FirmwareSubVersion, pHalData->FirmwareSignature, - pFwHdr->Month, - pFwHdr->Date, - pFwHdr->Hour, - pFwHdr->Minute + pFwHdr->month, + pFwHdr->date, + pFwHdr->hour, + pFwHdr->minute ); if (IS_FW_HEADER_EXIST_8723B(pFwHdr)) { diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h index 8897deb963c7..946236f704fe 100644 --- a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h +++ b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h @@ -44,7 +44,7 @@ #define FW_8723B_END_ADDRESS 0x1FFF /* 0x5FFF */ #define IS_FW_HEADER_EXIST_8723B(fw_hdr) \ - ((le16_to_cpu(fw_hdr->Signature) & 0xFFF0) == 0x5300) + ((le16_to_cpu(fw_hdr->signature) & 0xFFF0) == 0x5300) struct rt_firmware { u32 fw_length; @@ -56,31 +56,31 @@ struct rt_firmware_hdr { /* 8-byte alinment required */ /* LONG WORD 0 ---- */ - __le16 Signature; /* 92C0: test chip; 92C, 88C0: test chip; + __le16 signature; /* 92C0: test chip; 92C, 88C0: test chip; * 88C1: MP A-cut; 92C1: MP A-cut */ - u8 Category; /* AP/NIC and USB/PCI */ - u8 Function; /* Reserved for different FW function indications, + u8 category; /* AP/NIC and USB/PCI */ + u8 function; /* Reserved for different FW function indications, * for further use when driver needs to download * different FW in different conditions. */ - __le16 Version; /* FW Version */ - __le16 Subversion; /* FW Subversion, default 0x00 */ + __le16 version; /* FW Version */ + __le16 subversion; /* FW Subversion, default 0x00 */ /* LONG WORD 1 ---- */ - u8 Month; /* Release time Month field */ - u8 Date; /* Release time Date field */ - u8 Hour; /* Release time Hour field */ - u8 Minute; /* Release time Minute field */ + u8 month; /* Release time Month field */ + u8 date; /* Release time Date field */ + u8 hour; /* Release time Hour field */ + u8 minute; /* Release time Minute field */ - __le16 RamCodeSize; /* The size of RAM code */ - __le16 Rsvd2; + __le16 ram_code_size; /* The size of RAM code */ + __le16 rsvd2; /* LONG WORD 2 ---- */ - __le32 SvnIdx; /* The SVN entry index */ - __le32 Rsvd3; + __le32 svn_idx; /* The SVN entry index */ + __le32 rsvd3; /* LONG WORD 3 ---- */ - __le32 Rsvd4; - __le32 Rsvd5; + __le32 rsvd4; + __le32 rsvd5; }; #define DRIVER_EARLY_INT_TIME_8723B 0x05 -- 2.45.2