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 v3 4/8] staging: r8188eu: rename fields of struct rt_firmware_hdr
Date: Fri, 15 Apr 2022 14:10:19 +0200 [thread overview]
Message-ID: <20220415121023.11564-5-straube.linux@gmail.com> (raw)
In-Reply-To: <20220415121023.11564-1-straube.linux@gmail.com>
Rename the fields of struct rt_firmware_hdr to avoid camel case.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
v3:
- no changes
v2:
- no changes
drivers/staging/r8188eu/core/rtw_fw.c | 48 +++++++++++++--------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188eu/core/rtw_fw.c
index 323e0c634c4e..3da52a1ba23c 100644
--- a/drivers/staging/r8188eu/core/rtw_fw.c
+++ b/drivers/staging/r8188eu/core/rtw_fw.c
@@ -9,29 +9,29 @@
#define MAX_PAGE_SIZE 4096
#define IS_FW_HEADER_EXIST(_fwhdr) \
- ((le16_to_cpu(_fwhdr->Signature) & 0xFFF0) == 0x92C0 || \
- (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) == 0x88C0 || \
- (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) == 0x2300 || \
- (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) == 0x88E0)
+ ((le16_to_cpu(_fwhdr->signature) & 0xFFF0) == 0x92C0 || \
+ (le16_to_cpu(_fwhdr->signature) & 0xFFF0) == 0x88C0 || \
+ (le16_to_cpu(_fwhdr->signature) & 0xFFF0) == 0x2300 || \
+ (le16_to_cpu(_fwhdr->signature) & 0xFFF0) == 0x88E0)
struct rt_firmware_hdr {
- __le16 Signature;
- u8 Category;
- u8 Function;
- __le16 Version;
- u8 Subversion;
- u8 Rsvd1;
- u8 Month;
- u8 Date;
- u8 Hour;
- u8 Minute;
- __le16 RamCodeSize;
- u8 Foundry;
- u8 Rsvd2;
- __le32 SvnIdx;
- __le32 Rsvd3;
- __le32 Rsvd4;
- __le32 Rsvd5;
+ __le16 signature;
+ u8 category;
+ u8 function;
+ __le16 version;
+ u8 subversion;
+ u8 rsvd1;
+ u8 month;
+ u8 date;
+ u8 hour;
+ u8 minute;
+ __le16 ramcodesize;
+ u8 foundry;
+ u8 rsvd2;
+ __le32 svnidx;
+ __le32 rsvd3;
+ __le32 rsvd4;
+ __le32 rsvd5;
};
static void fw_download_enable(struct adapter *padapter, bool enable)
@@ -254,9 +254,9 @@ int rtl8188e_firmware_download(struct adapter *padapter)
/* To Check Fw header. Added by tynli. 2009.12.04. */
fwhdr = (struct rt_firmware_hdr *)dvobj->firmware.data;
- fw_version = le16_to_cpu(fwhdr->Version);
- fw_subversion = fwhdr->Subversion;
- fw_signature = le16_to_cpu(fwhdr->Signature);
+ fw_version = le16_to_cpu(fwhdr->version);
+ fw_subversion = fwhdr->subversion;
+ fw_signature = le16_to_cpu(fwhdr->signature);
if (!log_version++)
pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n",
--
2.35.1
next prev parent reply other threads:[~2022-04-15 12:10 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-15 12:10 [PATCH v3 0/8] staging: r8188eu: fix and clean up some firmware code Michael Straube
2022-04-15 12:10 ` [PATCH v3 1/8] staging: r8188eu: fix struct rt_firmware_hdr Michael Straube
2022-04-15 12:10 ` [PATCH v3 2/8] staging: r8188eu: convert u32 fields of rt_firmware_hdr to __le32 Michael Straube
2022-04-15 12:10 ` [PATCH v3 3/8] staging: r8188eu: clean up comments in struct rt_firmware_hdr Michael Straube
2022-04-15 15:44 ` Larry Finger
2022-04-15 18:05 ` Michael Straube
2022-04-15 18:53 ` Larry Finger
2022-04-15 12:10 ` Michael Straube [this message]
2022-04-15 12:10 ` [PATCH v3 5/8] staging: r8188eu: use sizeof instead of hardcoded firmware header size Michael Straube
2022-04-15 12:10 ` [PATCH v3 6/8] staging: r8188eu: remove variables from rtl8188e_firmware_download() Michael Straube
2022-04-15 12:10 ` [PATCH v3 7/8] staging: r8188eu: use pr_info_once() to log the firmware version Michael Straube
2022-04-15 12:10 ` [PATCH v3 8/8] staging: r8188eu: check firmware header existence before access Michael Straube
2022-04-15 15:48 ` [PATCH v3 0/8] staging: r8188eu: fix and clean up some firmware code Larry Finger
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=20220415121023.11564-5-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.