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 v4 7/8] staging: r8188eu: use pr_info_once() to log the firmware version
Date: Sun, 17 Apr 2022 19:54:40 +0200 [thread overview]
Message-ID: <20220417175441.13830-8-straube.linux@gmail.com> (raw)
In-Reply-To: <20220417175441.13830-1-straube.linux@gmail.com>
Use pr_info_once() instead of a static variable and an if statement
to log the firmware version only once.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
v4:
- no chages
v3:
- added back logging the firmware version only once, using
pr_info_once() instead of a static variable and if statement
v2:
- no changes
drivers/staging/r8188eu/core/rtw_fw.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188eu/core/rtw_fw.c
index 7fa985cc787a..7c0653bb3bbc 100644
--- a/drivers/staging/r8188eu/core/rtw_fw.c
+++ b/drivers/staging/r8188eu/core/rtw_fw.c
@@ -246,7 +246,6 @@ int rtl8188e_firmware_download(struct adapter *padapter)
struct rt_firmware_hdr *fwhdr = NULL;
u8 *fw_data;
u32 fw_size;
- static int log_version;
if (!dvobj->firmware.data)
ret = load_firmware(&dvobj->firmware, device);
@@ -260,10 +259,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;
- if (!log_version++)
- pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n",
- DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion,
- le16_to_cpu(fwhdr->signature));
+ pr_info_once("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n",
+ DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion,
+ le16_to_cpu(fwhdr->signature));
if (IS_FW_HEADER_EXIST(fwhdr)) {
fw_data = fw_data + sizeof(struct rt_firmware_hdr);
--
2.35.1
next prev parent reply other threads:[~2022-04-17 17:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-17 17:54 [PATCH v4 0/8] staging: r8188eu: fix and clean up some firmware code Michael Straube
2022-04-17 17:54 ` [PATCH v4 1/8] staging: r8188eu: fix struct rt_firmware_hdr Michael Straube
2022-04-17 17:54 ` [PATCH v4 2/8] staging: r8188eu: convert u32 fields of rt_firmware_hdr to __le32 Michael Straube
2022-04-17 17:54 ` [PATCH v4 3/8] staging: r8188eu: clean up comments in struct rt_firmware_hdr Michael Straube
2022-04-17 17:54 ` [PATCH v4 4/8] staging: r8188eu: rename fields of " Michael Straube
2022-04-17 17:54 ` [PATCH v4 5/8] staging: r8188eu: use sizeof instead of hardcoded firmware header size Michael Straube
2022-04-17 17:54 ` [PATCH v4 6/8] staging: r8188eu: remove variables from rtl8188e_firmware_download() Michael Straube
2022-04-17 17:54 ` Michael Straube [this message]
2022-04-17 17:54 ` [PATCH v4 8/8] staging: r8188eu: check firmware header existence before access Michael Straube
2022-04-17 18:24 ` [PATCH v4 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=20220417175441.13830-8-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.