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 10/10] staging: r8188eu: merge _ReadLEDSetting() into ReadAdapterInfo8188EU()
Date: Tue, 28 Dec 2021 11:11:20 +0100 [thread overview]
Message-ID: <20211228101120.9120-11-straube.linux@gmail.com> (raw)
In-Reply-To: <20211228101120.9120-1-straube.linux@gmail.com>
Function _ReadLEDSetting() sets only a single variable and the only
user is ReadAdapterInfo8188EU(). Remove _ReadLEDSetting() and set the
variable in ReadAdapterInfo8188EU() directly.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/usb_halinit.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 9edde72aebb2..b362c622ea8a 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -914,12 +914,6 @@ unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
/* EEPROM/EFUSE Content Parsing */
/* */
/* */
-static void _ReadLEDSetting(struct adapter *Adapter, u8 *PROMContent, bool AutoloadFail)
-{
- struct led_priv *pledpriv = &Adapter->ledpriv;
-
- pledpriv->bRegUseLed = true;
-}
static void Hal_EfuseParseMACAddr_8188EU(struct adapter *adapt, u8 *hwinfo, bool AutoLoadFail)
{
@@ -939,6 +933,7 @@ static void Hal_EfuseParseMACAddr_8188EU(struct adapter *adapt, u8 *hwinfo, bool
void ReadAdapterInfo8188EU(struct adapter *Adapter)
{
struct eeprom_priv *eeprom = &Adapter->eeprompriv;
+ struct led_priv *ledpriv = &Adapter->ledpriv;
u8 eeValue;
/* Read EEPROM size before call any EEPROM function */
@@ -966,7 +961,7 @@ void ReadAdapterInfo8188EU(struct adapter *Adapter)
Hal_ReadAntennaDiversity88E(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
Hal_ReadThermalMeter_88E(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
- _ReadLEDSetting(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);
+ ledpriv->bRegUseLed = true;
}
static void ResumeTxBeacon(struct adapter *adapt)
--
2.34.1
prev parent reply other threads:[~2021-12-28 10:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-28 10:11 [PATCH 00/10] staging: r8188eu: another set of cleanups Michael Straube
2021-12-28 10:11 ` [PATCH 01/10] staging: r8188eu: DM_PriCCA is set but never used Michael Straube
2021-12-28 10:11 ` [PATCH 02/10] staging: r8188eu: remove GET_CVID_ROM_VERSION Michael Straube
2021-12-28 10:11 ` [PATCH 03/10] staging: r8188eu: remove unused enum odm_h2c_cmd Michael Straube
2021-12-28 10:11 ` [PATCH 04/10] staging: r8188eu: remove ODM_CMNINFO_ABILITY from ODM_CmnInfoInit() Michael Straube
2021-12-28 10:11 ` [PATCH 05/10] staging: r8188eu: remove write-only fields from struct rtl_ps Michael Straube
2021-12-28 10:11 ` [PATCH 06/10] staging: r8188eu: FAT_State is always FAT_NORMAL_STATE Michael Straube
2021-12-28 10:11 ` [PATCH 07/10] staging: r8188eu: FAT_State is set but never used Michael Straube
2021-12-28 10:11 ` [PATCH 08/10] staging: r8188eu: TrainIdx " Michael Straube
2021-12-28 10:11 ` [PATCH 09/10] staging: r8188eu: RSSI_test is always false Michael Straube
2021-12-28 10:11 ` Michael Straube [this message]
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=20211228101120.9120-11-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®