From: Philipp Hortmann <philipp.g.hortmann@gmail.com>
To: Martin Kaiser <martin@kaiser.cx>,
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>,
Pavel Skripkin <paskripkin@gmail.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 10/10] staging: r8188eu: summarize tx/rx and scan blinking
Date: Sat, 15 Oct 2022 22:22:30 +0200 [thread overview]
Message-ID: <41f4482a-a213-8e71-be43-2e8539b646eb@gmail.com> (raw)
In-Reply-To: <20221015151115.232095-11-martin@kaiser.cx>
On 10/15/22 17:11, Martin Kaiser wrote:
> Summarize the code for tx/rx blinking and for scan blinking in blink_work.
> The only difference is the delay for scheduling the next worker.
>
> Signed-off-by: Martin Kaiser <martin@kaiser.cx>
> ---
> drivers/staging/r8188eu/core/rtw_led.c | 19 +++----------------
> 1 file changed, 3 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188eu/core/rtw_led.c
> index f8bd183fba1e..ce8de2eb7845 100644
> --- a/drivers/staging/r8188eu/core/rtw_led.c
> +++ b/drivers/staging/r8188eu/core/rtw_led.c
> @@ -81,21 +81,6 @@ static void blink_work(struct work_struct *work)
> schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL);
> break;
> case LED_BLINK_SCAN:
> - pLed->BlinkTimes--;
> - if (pLed->BlinkTimes == 0) {
> - if (check_fwstate(pmlmepriv, _FW_LINKED)) {
> - pLed->CurrLedState = LED_BLINK_NORMAL;
> - schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL);
> - } else {
> - pLed->CurrLedState = LED_BLINK_SLOWLY;
> - schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL);
> - }
> - pLed->bLedBlinkInProgress = false;
> - pLed->bLedScanBlinkInProgress = false;
> - } else {
> - schedule_delayed_work(&pLed->blink_work, LED_BLINK_SCAN_INTVL);
> - }
> - break;
> case LED_BLINK_TXRX:
> pLed->BlinkTimes--;
> if (pLed->BlinkTimes == 0) {
> @@ -109,7 +94,9 @@ static void blink_work(struct work_struct *work)
> pLed->bLedBlinkInProgress = false;
> pLed->bLedScanBlinkInProgress = false;
> } else {
> - schedule_delayed_work(&pLed->blink_work, LED_BLINK_FASTER_INTVL);
> + schedule_delayed_work(&pLed->blink_work,
> + pLed->CurrLedState == LED_BLINK_SCAN ?
> + LED_BLINK_SCAN_INTVL : LED_BLINK_FASTER_INTVL);
> }
> break;
> case LED_BLINK_WPS:
I cannot apply this patch.
Applying: staging: r8188eu: summarize tx/rx and scan blinking
error: patch failed: drivers/staging/r8188eu/core/rtw_led.c:81
error: drivers/staging/r8188eu/core/rtw_led.c: patch does not apply
Patch failed at 0001 staging: r8188eu: summarize tx/rx and scan blinking
next prev parent reply other threads:[~2022-10-15 20:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-15 15:11 [PATCH 00/10] staging: r8188eu: led layer fix and cleanups Martin Kaiser
2022-10-15 15:11 ` [PATCH 01/10] staging: r8188eu: fix led register settings Martin Kaiser
2022-10-16 9:13 ` Michael Straube
2022-10-16 16:22 ` Martin Kaiser
2022-10-15 15:11 ` [PATCH 02/10] staging: r8188eu: handle rtw_write8 errors in SwLedOn Martin Kaiser
2022-10-15 15:11 ` [PATCH 03/10] staging: r8188eu: fix status updates in SwLedOff Martin Kaiser
2022-10-15 15:42 ` Pavel Skripkin
2022-10-16 16:21 ` Martin Kaiser
2022-10-15 15:11 ` [PATCH 04/10] staging: r8188eu: SwLedOn needs no padapter parameter Martin Kaiser
2022-10-15 15:11 ` [PATCH 05/10] staging: r8188eu: SwLedOff " Martin Kaiser
2022-10-15 15:11 ` [PATCH 06/10] staging: r8188eu: remove two unused defines Martin Kaiser
2022-10-15 15:11 ` [PATCH 07/10] staging: r8188eu: don't include rtw_led.h from rtw_cmd.h Martin Kaiser
2022-10-15 15:11 ` [PATCH 08/10] staging: r8188eu: remove padapter from struct led_priv Martin Kaiser
2022-10-15 15:11 ` [PATCH 09/10] staging: r8188eu: set two more state variables Martin Kaiser
2022-10-15 15:11 ` [PATCH 10/10] staging: r8188eu: summarize tx/rx and scan blinking Martin Kaiser
2022-10-15 20:22 ` Philipp Hortmann [this message]
2022-10-16 16:07 ` Martin Kaiser
2022-10-16 18:45 ` [PATCH 00/10] staging: r8188eu: led layer fix and cleanups Philipp Hortmann
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=41f4482a-a213-8e71-be43-2e8539b646eb@gmail.com \
--to=philipp.g.hortmann@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=martin@kaiser.cx \
--cc=paskripkin@gmail.com \
--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®