From: Martin Kaiser <martin@kaiser.cx>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
Michael Straube <straube.linux@gmail.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 07/21] staging: r8188eu: clean up the blink worker code
Date: Sun, 26 Dec 2021 20:55:42 +0100 [thread overview]
Message-ID: <20211226195556.159471-8-martin@kaiser.cx> (raw)
In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx>
Merge the BlinkWorkItemCallback and BlinkHandler functions.
Rename the resulting function to blink_work and make it
internal to the led layer.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/staging/r8188eu/core/rtw_led.c | 13 ++++---------
drivers/staging/r8188eu/include/rtw_led.h | 4 ----
2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188eu/core/rtw_led.c
index 52e31d3307df..517aef664bfc 100644
--- a/drivers/staging/r8188eu/core/rtw_led.c
+++ b/drivers/staging/r8188eu/core/rtw_led.c
@@ -5,13 +5,6 @@
#include "../include/rtw_led.h"
#include "../include/rtl8188e_spec.h"
-void BlinkWorkItemCallback(struct work_struct *work)
-{
- struct delayed_work *dwork = to_delayed_work(work);
- struct LED_871x *pLed = container_of(dwork, struct LED_871x, blink_work);
- BlinkHandler(pLed);
-}
-
static void ResetLedStatus(struct LED_871x *pLed)
{
pLed->CurrLedState = RTW_LED_OFF; /* Current LED state. */
@@ -391,8 +384,10 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
}
}
-void BlinkHandler(struct LED_871x *pLed)
+static void blink_work(struct work_struct *work)
{
+ struct delayed_work *dwork = to_delayed_work(work);
+ struct LED_871x *pLed = container_of(dwork, struct LED_871x, blink_work);
struct adapter *padapter = pLed->padapter;
if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped))
@@ -410,7 +405,7 @@ void rtl8188eu_InitSwLeds(struct adapter *padapter)
pLed->padapter = padapter;
ResetLedStatus(pLed);
- INIT_DELAYED_WORK(&pLed->blink_work, BlinkWorkItemCallback);
+ INIT_DELAYED_WORK(&pLed->blink_work, blink_work);
}
void rtl8188eu_DeInitSwLeds(struct adapter *padapter)
diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8188eu/include/rtw_led.h
index 984fba6363ad..cd9e40aa7c65 100644
--- a/drivers/staging/r8188eu/include/rtw_led.h
+++ b/drivers/staging/r8188eu/include/rtw_led.h
@@ -100,11 +100,7 @@ struct led_priv{
(adapt)->ledpriv.LedControlHandler((adapt), (action)); \
} while (0)
-void BlinkWorkItemCallback(struct work_struct *work);
-
void rtl8188eu_InitSwLeds(struct adapter *padapter);
void rtl8188eu_DeInitSwLeds(struct adapter *padapter);
-void BlinkHandler(struct LED_871x * pLed);
-
#endif /* __RTW_LED_H_ */
--
2.30.2
next prev parent reply other threads:[~2021-12-26 19:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-26 19:55 [PATCH 00/21] staging: r8188eu: simplify the led layer Martin Kaiser
2021-12-26 19:55 ` [PATCH 01/21] staging: r8188eu: switch the led off during deinit Martin Kaiser
2021-12-26 19:55 ` [PATCH 02/21] staging: r8188eu: move SwLedOn and SwLedOff into rtw_led.c Martin Kaiser
2021-12-26 19:55 ` [PATCH 03/21] staging: r8188eu: move (de)init functions from hal to rtw_led Martin Kaiser
2021-12-26 19:55 ` [PATCH 04/21] staging: r8188eu: merge InitLed871x and rtl8188eu_InitSwLeds Martin Kaiser
2021-12-26 19:55 ` [PATCH 05/21] staging: r8188eu: merge DeInitLed871x and rtl8188eu_DeInitSwLeds Martin Kaiser
2021-12-26 19:55 ` [PATCH 06/21] staging: r8188eu: make ResetLedStatus static Martin Kaiser
2021-12-26 19:55 ` Martin Kaiser [this message]
2021-12-26 19:55 ` [PATCH 08/21] staging: r8188eu: clean up blinking macros Martin Kaiser
2021-12-26 19:55 ` [PATCH 09/21] staging: r8188eu: remove unused blink mode defines Martin Kaiser
2021-12-26 19:55 ` [PATCH 10/21] staging: r8188eu: bLedStartToLinkBlinkInProgress is set but not used Martin Kaiser
2021-12-26 19:55 ` [PATCH 11/21] staging: r8188eu: make blink interval defines internal Martin Kaiser
2021-12-26 19:55 ` [PATCH 12/21] staging: r8188eu: use bool for boolean values Martin Kaiser
2021-12-26 19:55 ` [PATCH 13/21] staging: r8188eu: remove obsolete comments Martin Kaiser
2021-12-26 19:55 ` [PATCH 14/21] staging: r8188eu: remove LedControlHandler Martin Kaiser
2021-12-26 19:55 ` [PATCH 15/21] staging: r8188eu: LED_CTL_POWER_ON is not used Martin Kaiser
2021-12-26 19:55 ` [PATCH 16/21] staging: r8188eu: LED_CTL_START_WPS_BOTTON " Martin Kaiser
2021-12-26 19:55 ` [PATCH 17/21] staging: r8188eu: remove bStopBlinking Martin Kaiser
2021-12-26 19:55 ` [PATCH 18/21] staging: r8188eu: summarize some BlinkingLedState Martin Kaiser
2021-12-26 19:55 ` [PATCH 19/21] staging: r8188eu: merge blink_work and SwLedBlink1 Martin Kaiser
2021-12-26 19:55 ` [PATCH 20/21] staging: r8188eu: merge rtw_led_control and SwLedControlMode1 Martin Kaiser
2021-12-26 19:55 ` [PATCH 21/21] staging: r8188eu: rfoff_reason is never initialised Martin Kaiser
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=20211226195556.159471-8-martin@kaiser.cx \
--to=martin@kaiser.cx \
--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 \
--cc=straube.linux@gmail.com \
/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®