From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2574EC433FE for ; Sun, 26 Dec 2021 19:56:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234351AbhLZT4R (ORCPT ); Sun, 26 Dec 2021 14:56:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230380AbhLZT4P (ORCPT ); Sun, 26 Dec 2021 14:56:15 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1E41C061401 for ; Sun, 26 Dec 2021 11:56:14 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zcn-0000Fz-MX; Sun, 26 Dec 2021 20:56:09 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser , stable@vger.kernel.org Subject: [PATCH 01/21] staging: r8188eu: switch the led off during deinit Date: Sun, 26 Dec 2021 20:55:36 +0100 Message-Id: <20211226195556.159471-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When the driver is unloaded or when the system goes into standby mode, DeInitLed871x is called to stop the led layer. In this case, we stop the blinking worker but we do not switch the led off explicitly. On my system, I can go into standby mode with the LED enabled. Add a call to SwLedOff to fix this. Cc: stable@vger.kernel.org Fixes: 15865124feed ("staging: r8188eu: introduce new core dir for RTL8188e= u driver") Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index e1be1ba189cb..25fab7bce7dc 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -41,6 +41,7 @@ void DeInitLed871x(struct LED_871x *pLed) { cancel_delayed_work_sync(&pLed->blink_work); ResetLedStatus(pLed); + SwLedOff(pLed->padapter, pLed); } =20 static void SwLedBlink1(struct LED_871x *pLed) --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5EBF3C433F5 for ; Sun, 26 Dec 2021 19:56:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230380AbhLZT4S (ORCPT ); Sun, 26 Dec 2021 14:56:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234209AbhLZT4P (ORCPT ); Sun, 26 Dec 2021 14:56:15 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96A43C06173E for ; Sun, 26 Dec 2021 11:56:15 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zco-0000Fz-NT; Sun, 26 Dec 2021 20:56:10 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 02/21] staging: r8188eu: move SwLedOn and SwLedOff into rtw_led.c Date: Sun, 26 Dec 2021 20:55:37 +0100 Message-Id: <20211226195556.159471-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Move the low-level functions SwLedOn and SwLedOff from the hal layer into rtw_led.c. This is the only place where they're used. There's no need to go through the hal layer for a simple register access if the driver supports only a single chipset. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 31 ++++++++++++++++++++ drivers/staging/r8188eu/hal/rtl8188eu_led.c | 32 --------------------- drivers/staging/r8188eu/include/rtw_led.h | 3 -- 3 files changed, 31 insertions(+), 35 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 25fab7bce7dc..2e3a689fb2fd 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -3,6 +3,7 @@ =20 #include "../include/drv_types.h" #include "../include/rtw_led.h" +#include "../include/rtl8188e_spec.h" =20 void BlinkWorkItemCallback(struct work_struct *work) { @@ -28,6 +29,36 @@ void ResetLedStatus(struct LED_871x *pLed) pLed->bLedScanBlinkInProgress =3D false; } =20 +static void SwLedOn(struct adapter *padapter, struct LED_871x *pLed) +{ + u8 LedCfg; + + if (padapter->bSurpriseRemoved || padapter->bDriverStopped) + return; + + LedCfg =3D rtw_read8(padapter, REG_LEDCFG2); + rtw_write8(padapter, REG_LEDCFG2, (LedCfg & 0xf0) | BIT(5) | BIT(6)); /* = SW control led0 on. */ + pLed->bLedOn =3D true; +} + +static void SwLedOff(struct adapter *padapter, struct LED_871x *pLed) +{ + u8 LedCfg; + + if (padapter->bSurpriseRemoved || padapter->bDriverStopped) + goto exit; + + LedCfg =3D rtw_read8(padapter, REG_LEDCFG2);/* 0x4E */ + + LedCfg &=3D 0x90; /* Set to software control. */ + rtw_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3))); + LedCfg =3D rtw_read8(padapter, REG_MAC_PINMUX_CFG); + LedCfg &=3D 0xFE; + rtw_write8(padapter, REG_MAC_PINMUX_CFG, LedCfg); +exit: + pLed->bLedOn =3D false; +} + void InitLed871x(struct adapter *padapter, struct LED_871x *pLed) { pLed->padapter =3D padapter; diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_led.c b/drivers/staging/= r8188eu/hal/rtl8188eu_led.c index 6fd1d1d476c7..46dd8c6703b7 100644 --- a/drivers/staging/r8188eu/hal/rtl8188eu_led.c +++ b/drivers/staging/r8188eu/hal/rtl8188eu_led.c @@ -6,38 +6,6 @@ #include "../include/rtl8188e_hal.h" #include "../include/rtl8188e_led.h" =20 -/* LED object. */ - -void SwLedOn(struct adapter *padapter, struct LED_871x *pLed) -{ - u8 LedCfg; - - if (padapter->bSurpriseRemoved || padapter->bDriverStopped) - return; - - LedCfg =3D rtw_read8(padapter, REG_LEDCFG2); - rtw_write8(padapter, REG_LEDCFG2, (LedCfg & 0xf0) | BIT(5) | BIT(6)); /* = SW control led0 on. */ - pLed->bLedOn =3D true; -} - -void SwLedOff(struct adapter *padapter, struct LED_871x *pLed) -{ - u8 LedCfg; - - if (padapter->bSurpriseRemoved || padapter->bDriverStopped) - goto exit; - - LedCfg =3D rtw_read8(padapter, REG_LEDCFG2);/* 0x4E */ - - LedCfg &=3D 0x90; /* Set to software control. */ - rtw_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3))); - LedCfg =3D rtw_read8(padapter, REG_MAC_PINMUX_CFG); - LedCfg &=3D 0xFE; - rtw_write8(padapter, REG_MAC_PINMUX_CFG, LedCfg); -exit: - pLed->bLedOn =3D false; -} - /* Interface to manipulate LED objects. */ /* Default LED behavior. */ =20 diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/include/rtw_led.h index e9b6d7768c2d..37f1dbc111f1 100644 --- a/drivers/staging/r8188eu/include/rtw_led.h +++ b/drivers/staging/r8188eu/include/rtw_led.h @@ -107,9 +107,6 @@ void ResetLedStatus(struct LED_871x * pLed); void InitLed871x(struct adapter *padapter, struct LED_871x *pLed); void DeInitLed871x(struct LED_871x *pLed); =20 -/* hal... */ void BlinkHandler(struct LED_871x * pLed); -void SwLedOn(struct adapter *padapter, struct LED_871x *pLed); -void SwLedOff(struct adapter *padapter, struct LED_871x *pLed); =20 #endif /* __RTW_LED_H_ */ --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18D33C433EF for ; Sun, 26 Dec 2021 19:56:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234376AbhLZT4V (ORCPT ); Sun, 26 Dec 2021 14:56:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234069AbhLZT4Q (ORCPT ); Sun, 26 Dec 2021 14:56:16 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF30DC061401 for ; Sun, 26 Dec 2021 11:56:15 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zcp-0000Fz-OW; Sun, 26 Dec 2021 20:56:11 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 03/21] staging: r8188eu: move (de)init functions from hal to rtw_led Date: Sun, 26 Dec 2021 20:55:38 +0100 Message-Id: <20211226195556.159471-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Move the led init and deinit functions from the hal layer to rtw_led.c. rtl8188eu_led.c and rtl8188e_led.h can now be removed. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/Makefile | 1 - drivers/staging/r8188eu/core/rtw_led.c | 16 ++++++++++ drivers/staging/r8188eu/hal/rtl8188eu_led.c | 30 ------------------- drivers/staging/r8188eu/hal/usb_halinit.c | 1 - .../staging/r8188eu/include/rtl8188e_led.h | 16 ---------- drivers/staging/r8188eu/include/rtw_led.h | 3 ++ drivers/staging/r8188eu/os_dep/ioctl_linux.c | 2 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 8 files changed, 21 insertions(+), 50 deletions(-) delete mode 100644 drivers/staging/r8188eu/hal/rtl8188eu_led.c delete mode 100644 drivers/staging/r8188eu/include/rtl8188e_led.h diff --git a/drivers/staging/r8188eu/Makefile b/drivers/staging/r8188eu/Mak= efile index 580b9308d566..5e1649491ef4 100644 --- a/drivers/staging/r8188eu/Makefile +++ b/drivers/staging/r8188eu/Makefile @@ -22,7 +22,6 @@ r8188eu-y =3D \ hal/rtl8188e_rf6052.o \ hal/rtl8188e_rxdesc.o \ hal/rtl8188e_xmit.o \ - hal/rtl8188eu_led.o \ hal/rtl8188eu_recv.o \ hal/rtl8188eu_xmit.o \ hal/usb_halinit.o \ diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 2e3a689fb2fd..50dabc3d2e29 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -417,6 +417,22 @@ void BlinkHandler(struct LED_871x *pLed) SwLedBlink1(pLed); } =20 +void rtl8188eu_InitSwLeds(struct adapter *padapter) +{ + struct led_priv *pledpriv =3D &padapter->ledpriv; + + pledpriv->LedControlHandler =3D LedControl8188eu; + + InitLed871x(padapter, &pledpriv->SwLed0); +} + +void rtl8188eu_DeInitSwLeds(struct adapter *padapter) +{ + struct led_priv *ledpriv =3D &padapter->ledpriv; + + DeInitLed871x(&ledpriv->SwLed0); +} + void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE LedActio= n) { struct led_priv *ledpriv =3D &padapter->ledpriv; diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_led.c b/drivers/staging/= r8188eu/hal/rtl8188eu_led.c deleted file mode 100644 index 46dd8c6703b7..000000000000 --- a/drivers/staging/r8188eu/hal/rtl8188eu_led.c +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* Copyright(c) 2007 - 2011 Realtek Corporation. */ - -#include "../include/osdep_service.h" -#include "../include/drv_types.h" -#include "../include/rtl8188e_hal.h" -#include "../include/rtl8188e_led.h" - -/* Interface to manipulate LED objects. */ -/* Default LED behavior. */ - -/* Description: */ -/* Initialize all LED_871x objects. */ -void rtl8188eu_InitSwLeds(struct adapter *padapter) -{ - struct led_priv *pledpriv =3D &padapter->ledpriv; - - pledpriv->LedControlHandler =3D LedControl8188eu; - - InitLed871x(padapter, &pledpriv->SwLed0); -} - -/* Description: */ -/* DeInitialize all LED_819xUsb objects. */ -void rtl8188eu_DeInitSwLeds(struct adapter *padapter) -{ - struct led_priv *ledpriv =3D &padapter->ledpriv; - - DeInitLed871x(&ledpriv->SwLed0); -} diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 9edde72aebb2..293a616eabc6 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -8,7 +8,6 @@ #include "../include/rtw_efuse.h" =20 #include "../include/rtl8188e_hal.h" -#include "../include/rtl8188e_led.h" #include "../include/rtw_iol.h" #include "../include/usb_ops.h" #include "../include/usb_osintf.h" diff --git a/drivers/staging/r8188eu/include/rtl8188e_led.h b/drivers/stagi= ng/r8188eu/include/rtl8188e_led.h deleted file mode 100644 index 02cdc970bb17..000000000000 --- a/drivers/staging/r8188eu/include/rtl8188e_led.h +++ /dev/null @@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ -/* Copyright(c) 2007 - 2011 Realtek Corporation. */ - -#ifndef __RTL8188E_LED_H__ -#define __RTL8188E_LED_H__ - -#include "osdep_service.h" -#include "drv_types.h" - -/* */ -/* Interface to manipulate LED objects. */ -/* */ -void rtl8188eu_InitSwLeds(struct adapter *padapter); -void rtl8188eu_DeInitSwLeds(struct adapter *padapter); - -#endif diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/include/rtw_led.h index 37f1dbc111f1..d4ba5ac3e48a 100644 --- a/drivers/staging/r8188eu/include/rtw_led.h +++ b/drivers/staging/r8188eu/include/rtw_led.h @@ -107,6 +107,9 @@ void ResetLedStatus(struct LED_871x * pLed); void InitLed871x(struct adapter *padapter, struct LED_871x *pLed); void DeInitLed871x(struct LED_871x *pLed); =20 +void rtl8188eu_InitSwLeds(struct adapter *padapter); +void rtl8188eu_DeInitSwLeds(struct adapter *padapter); + void BlinkHandler(struct LED_871x * pLed); =20 #endif /* __RTW_LED_H_ */ diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging= /r8188eu/os_dep/ioctl_linux.c index e7f35143dfe1..88e9734b3094 100644 --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c @@ -12,7 +12,7 @@ #include "../include/rtw_ioctl_set.h" #include "../include/usb_ops.h" #include "../include/rtl8188e_hal.h" -#include "../include/rtl8188e_led.h" +#include "../include/rtw_led.h" =20 #include "../include/rtw_iol.h" =20 diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index ad20ab12ee8c..f81e26785d66 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -11,7 +11,7 @@ #include "../include/rtw_ioctl.h" #include "../include/usb_osintf.h" #include "../include/rtw_br_ext.h" -#include "../include/rtl8188e_led.h" +#include "../include/rtw_led.h" #include "../include/rtl8188e_dm.h" =20 MODULE_LICENSE("GPL"); --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00AA5C433F5 for ; Sun, 26 Dec 2021 19:56:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234397AbhLZT4X (ORCPT ); Sun, 26 Dec 2021 14:56:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234346AbhLZT4Q (ORCPT ); Sun, 26 Dec 2021 14:56:16 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC83FC06173E for ; Sun, 26 Dec 2021 11:56:16 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zcq-0000Fz-Qg; Sun, 26 Dec 2021 20:56:12 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 04/21] staging: r8188eu: merge InitLed871x and rtl8188eu_InitSwLeds Date: Sun, 26 Dec 2021 20:55:39 +0100 Message-Id: <20211226195556.159471-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Copy InitLed871x into rtl8188eu_InitSwLeds. There's no need for two separate functions. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 14 ++++---------- drivers/staging/r8188eu/include/rtw_led.h | 1 - 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 50dabc3d2e29..541aba6faaf0 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -59,15 +59,6 @@ static void SwLedOff(struct adapter *padapter, struct LE= D_871x *pLed) pLed->bLedOn =3D false; } =20 -void InitLed871x(struct adapter *padapter, struct LED_871x *pLed) -{ - pLed->padapter =3D padapter; - - ResetLedStatus(pLed); - - INIT_DELAYED_WORK(&pLed->blink_work, BlinkWorkItemCallback); -} - void DeInitLed871x(struct LED_871x *pLed) { cancel_delayed_work_sync(&pLed->blink_work); @@ -420,10 +411,13 @@ void BlinkHandler(struct LED_871x *pLed) void rtl8188eu_InitSwLeds(struct adapter *padapter) { struct led_priv *pledpriv =3D &padapter->ledpriv; + struct LED_871x *pLed =3D &pledpriv->SwLed0; =20 pledpriv->LedControlHandler =3D LedControl8188eu; =20 - InitLed871x(padapter, &pledpriv->SwLed0); + pLed->padapter =3D padapter; + ResetLedStatus(pLed); + INIT_DELAYED_WORK(&pLed->blink_work, BlinkWorkItemCallback); } =20 void rtl8188eu_DeInitSwLeds(struct adapter *padapter) diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/include/rtw_led.h index d4ba5ac3e48a..2c4dc361e469 100644 --- a/drivers/staging/r8188eu/include/rtw_led.h +++ b/drivers/staging/r8188eu/include/rtw_led.h @@ -104,7 +104,6 @@ void BlinkWorkItemCallback(struct work_struct *work); =20 void ResetLedStatus(struct LED_871x * pLed); =20 -void InitLed871x(struct adapter *padapter, struct LED_871x *pLed); void DeInitLed871x(struct LED_871x *pLed); =20 void rtl8188eu_InitSwLeds(struct adapter *padapter); --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54493C433F5 for ; Sun, 26 Dec 2021 19:56:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234381AbhLZT4Z (ORCPT ); Sun, 26 Dec 2021 14:56:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234352AbhLZT4S (ORCPT ); Sun, 26 Dec 2021 14:56:18 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B845C06173E for ; Sun, 26 Dec 2021 11:56:17 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zcr-0000Fz-SE; Sun, 26 Dec 2021 20:56:13 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 05/21] staging: r8188eu: merge DeInitLed871x and rtl8188eu_DeInitSwLeds Date: Sun, 26 Dec 2021 20:55:40 +0100 Message-Id: <20211226195556.159471-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Merge DeInitLed871x and rtl8188eu_DeInitSwLeds, both of which are small and simple. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 12 ++++-------- drivers/staging/r8188eu/include/rtw_led.h | 2 -- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 541aba6faaf0..1eb70f33c158 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -59,13 +59,6 @@ static void SwLedOff(struct adapter *padapter, struct LE= D_871x *pLed) pLed->bLedOn =3D false; } =20 -void DeInitLed871x(struct LED_871x *pLed) -{ - cancel_delayed_work_sync(&pLed->blink_work); - ResetLedStatus(pLed); - SwLedOff(pLed->padapter, pLed); -} - static void SwLedBlink1(struct LED_871x *pLed) { struct adapter *padapter =3D pLed->padapter; @@ -423,8 +416,11 @@ void rtl8188eu_InitSwLeds(struct adapter *padapter) void rtl8188eu_DeInitSwLeds(struct adapter *padapter) { struct led_priv *ledpriv =3D &padapter->ledpriv; + struct LED_871x *pLed =3D &ledpriv->SwLed0; =20 - DeInitLed871x(&ledpriv->SwLed0); + cancel_delayed_work_sync(&pLed->blink_work); + ResetLedStatus(pLed); + SwLedOff(padapter, pLed); } =20 void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE LedActio= n) diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/include/rtw_led.h index 2c4dc361e469..ed8574c88288 100644 --- a/drivers/staging/r8188eu/include/rtw_led.h +++ b/drivers/staging/r8188eu/include/rtw_led.h @@ -104,8 +104,6 @@ void BlinkWorkItemCallback(struct work_struct *work); =20 void ResetLedStatus(struct LED_871x * pLed); =20 -void DeInitLed871x(struct LED_871x *pLed); - void rtl8188eu_InitSwLeds(struct adapter *padapter); void rtl8188eu_DeInitSwLeds(struct adapter *padapter); =20 --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18744C433EF for ; Sun, 26 Dec 2021 19:56:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234430AbhLZT42 (ORCPT ); Sun, 26 Dec 2021 14:56:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234363AbhLZT4U (ORCPT ); Sun, 26 Dec 2021 14:56:20 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3882AC06173E for ; Sun, 26 Dec 2021 11:56:19 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zcs-0000Fz-SQ; Sun, 26 Dec 2021 20:56:14 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 06/21] staging: r8188eu: make ResetLedStatus static Date: Sun, 26 Dec 2021 20:55:41 +0100 Message-Id: <20211226195556.159471-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The ResetLedStatus function is used only by the led layer. Make it static. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 2 +- drivers/staging/r8188eu/include/rtw_led.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 1eb70f33c158..52e31d3307df 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -12,7 +12,7 @@ void BlinkWorkItemCallback(struct work_struct *work) BlinkHandler(pLed); } =20 -void ResetLedStatus(struct LED_871x *pLed) +static void ResetLedStatus(struct LED_871x *pLed) { pLed->CurrLedState =3D RTW_LED_OFF; /* Current LED state. */ pLed->bLedOn =3D false; /* true if LED is ON, false if LED is OFF. */ diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/include/rtw_led.h index ed8574c88288..984fba6363ad 100644 --- a/drivers/staging/r8188eu/include/rtw_led.h +++ b/drivers/staging/r8188eu/include/rtw_led.h @@ -102,8 +102,6 @@ struct led_priv{ =20 void BlinkWorkItemCallback(struct work_struct *work); =20 -void ResetLedStatus(struct LED_871x * pLed); - void rtl8188eu_InitSwLeds(struct adapter *padapter); void rtl8188eu_DeInitSwLeds(struct adapter *padapter); =20 --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CB17C433EF for ; Sun, 26 Dec 2021 19:56:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234437AbhLZT4a (ORCPT ); Sun, 26 Dec 2021 14:56:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234364AbhLZT4U (ORCPT ); Sun, 26 Dec 2021 14:56:20 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5222C061757 for ; Sun, 26 Dec 2021 11:56:19 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zct-0000Fz-Tm; Sun, 26 Dec 2021 20:56:15 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 07/21] staging: r8188eu: clean up the blink worker code Date: Sun, 26 Dec 2021 20:55:42 +0100 Message-Id: <20211226195556.159471-8-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- 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/r8188= eu/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" =20 -void BlinkWorkItemCallback(struct work_struct *work) -{ - struct delayed_work *dwork =3D to_delayed_work(work); - struct LED_871x *pLed =3D container_of(dwork, struct LED_871x, blink_work= ); - BlinkHandler(pLed); -} - static void ResetLedStatus(struct LED_871x *pLed) { pLed->CurrLedState =3D RTW_LED_OFF; /* Current LED state. */ @@ -391,8 +384,10 @@ static void SwLedControlMode1(struct adapter *padapter= , enum LED_CTL_MODE LedAct } } =20 -void BlinkHandler(struct LED_871x *pLed) +static void blink_work(struct work_struct *work) { + struct delayed_work *dwork =3D to_delayed_work(work); + struct LED_871x *pLed =3D container_of(dwork, struct LED_871x, blink_work= ); struct adapter *padapter =3D pLed->padapter; =20 if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped)) @@ -410,7 +405,7 @@ void rtl8188eu_InitSwLeds(struct adapter *padapter) =20 pLed->padapter =3D padapter; ResetLedStatus(pLed); - INIT_DELAYED_WORK(&pLed->blink_work, BlinkWorkItemCallback); + INIT_DELAYED_WORK(&pLed->blink_work, blink_work); } =20 void rtl8188eu_DeInitSwLeds(struct adapter *padapter) diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/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) =20 -void BlinkWorkItemCallback(struct work_struct *work); - void rtl8188eu_InitSwLeds(struct adapter *padapter); void rtl8188eu_DeInitSwLeds(struct adapter *padapter); =20 -void BlinkHandler(struct LED_871x * pLed); - #endif /* __RTW_LED_H_ */ --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACD2CC433EF for ; Sun, 26 Dec 2021 19:56:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234479AbhLZT4c (ORCPT ); Sun, 26 Dec 2021 14:56:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234374AbhLZT4V (ORCPT ); Sun, 26 Dec 2021 14:56:21 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AA95C061401 for ; Sun, 26 Dec 2021 11:56:21 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zcu-0000Fz-TH; Sun, 26 Dec 2021 20:56:16 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 08/21] staging: r8188eu: clean up blinking macros Date: Sun, 26 Dec 2021 20:55:43 +0100 Message-Id: <20211226195556.159471-9-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Clean up the macros that check the blinking mode of a LED. The macro IS_LED_BLINKING is not used and can be removed. The IS_LED_WPS_BLINKING macro is used only by rtw_led.c. Move the macro into this file. The macro parameter is always a struct LED_871x *, there's no need for a cast. Rename the parameter to l and put it in parentheses, which is good practice for macro parameters. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 5 +++++ drivers/staging/r8188eu/include/rtw_led.h | 9 --------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 517aef664bfc..63b811cba277 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -5,6 +5,11 @@ #include "../include/rtw_led.h" #include "../include/rtl8188e_spec.h" =20 +#define IS_LED_WPS_BLINKING(l) \ + ((l)->CurrLedState =3D=3D LED_BLINK_WPS || \ + (l)->CurrLedState =3D=3D LED_BLINK_WPS_STOP || \ + (l)->bLedWPSBlinkInProgress) + static void ResetLedStatus(struct LED_871x *pLed) { pLed->CurrLedState =3D RTW_LED_OFF; /* Current LED state. */ diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/include/rtw_led.h index cd9e40aa7c65..69656da76d19 100644 --- a/drivers/staging/r8188eu/include/rtw_led.h +++ b/drivers/staging/r8188eu/include/rtw_led.h @@ -74,15 +74,6 @@ struct LED_871x { struct delayed_work blink_work; }; =20 -#define IS_LED_WPS_BLINKING(_LED_871x) \ - (((struct LED_871x *)_LED_871x)->CurrLedState =3D=3D LED_BLINK_WPS || \ - ((struct LED_871x *)_LED_871x)->CurrLedState =3D=3D LED_BLINK_WPS_STOP ||= \ - ((struct LED_871x *)_LED_871x)->bLedWPSBlinkInProgress) - -#define IS_LED_BLINKING(_LED_871x) \ - (((struct LED_871x *)_LED_871x)->bLedWPSBlinkInProgress || \ - ((struct LED_871x *)_LED_871x)->bLedScanBlinkInProgress) - void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE LedActio= n); =20 struct led_priv{ --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 535C3C433EF for ; Sun, 26 Dec 2021 19:56:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234464AbhLZT4g (ORCPT ); Sun, 26 Dec 2021 14:56:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234356AbhLZT4W (ORCPT ); Sun, 26 Dec 2021 14:56:22 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9BF8C06173E for ; Sun, 26 Dec 2021 11:56:21 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zcv-0000Fz-RC; Sun, 26 Dec 2021 20:56:17 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 09/21] staging: r8188eu: remove unused blink mode defines Date: Sun, 26 Dec 2021 20:55:44 +0100 Message-Id: <20211226195556.159471-10-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove defines for led blink modes which are not used by this driver. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_led.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/include/rtw_led.h index 69656da76d19..e7fd3966326b 100644 --- a/drivers/staging/r8188eu/include/rtw_led.h +++ b/drivers/staging/r8188eu/include/rtw_led.h @@ -34,21 +34,15 @@ enum LED_STATE_871x { RTW_LED_OFF =3D 2, LED_BLINK_NORMAL =3D 3, LED_BLINK_SLOWLY =3D 4, - LED_BLINK_POWER_ON =3D 5, LED_BLINK_SCAN =3D 6, /* LED is blinking during scanning period, * the # of times to blink is depend on time * for scanning. */ - LED_BLINK_NO_LINK =3D 7, /* LED is blinking during no link state. */ LED_BLINK_StartToBlink =3D 8,/* Customzied for Sercomm Printer * Server case */ LED_BLINK_TXRX =3D 9, LED_BLINK_WPS =3D 10, /* LED is blinkg during WPS communication */ LED_BLINK_WPS_STOP =3D 11, /* for ALPHA */ - LED_BLINK_WPS_STOP_OVERLAP =3D 12, /* for BELKIN */ LED_BLINK_RUNTOP =3D 13, /* Customized for RunTop */ - LED_BLINK_CAMEO =3D 14, - LED_BLINK_XAVI =3D 15, - LED_BLINK_ALWAYS_ON =3D 16, }; =20 struct LED_871x { --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C365C433F5 for ; Sun, 26 Dec 2021 19:56:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234445AbhLZT4e (ORCPT ); Sun, 26 Dec 2021 14:56:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234385AbhLZT4W (ORCPT ); Sun, 26 Dec 2021 14:56:22 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0E49C061757 for ; Sun, 26 Dec 2021 11:56:22 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zcw-0000Fz-P5; Sun, 26 Dec 2021 20:56:18 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 10/21] staging: r8188eu: bLedStartToLinkBlinkInProgress is set but not used Date: Sun, 26 Dec 2021 20:55:45 +0100 Message-Id: <20211226195556.159471-11-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove bLedStartToLinkBlinkInProgress from struct LED_871x. It's set but not used. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 1 - drivers/staging/r8188eu/include/rtw_led.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 63b811cba277..7eade85302c8 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -23,7 +23,6 @@ static void ResetLedStatus(struct LED_871x *pLed) =20 pLed->bLedNoLinkBlinkInProgress =3D false; pLed->bLedLinkBlinkInProgress =3D false; - pLed->bLedStartToLinkBlinkInProgress =3D false; pLed->bLedScanBlinkInProgress =3D false; } =20 diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/include/rtw_led.h index e7fd3966326b..fd7b0cbd64ac 100644 --- a/drivers/staging/r8188eu/include/rtw_led.h +++ b/drivers/staging/r8188eu/include/rtw_led.h @@ -63,7 +63,6 @@ struct LED_871x { /* ALPHA, added by chiyoko, 20090106 */ u8 bLedNoLinkBlinkInProgress; u8 bLedLinkBlinkInProgress; - u8 bLedStartToLinkBlinkInProgress; u8 bLedScanBlinkInProgress; struct delayed_work blink_work; }; --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4AA4C433EF for ; Sun, 26 Dec 2021 19:56:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234511AbhLZT4i (ORCPT ); Sun, 26 Dec 2021 14:56:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234399AbhLZT4Y (ORCPT ); Sun, 26 Dec 2021 14:56:24 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55BAEC06173E for ; Sun, 26 Dec 2021 11:56:24 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zcx-0000Fz-PB; Sun, 26 Dec 2021 20:56:19 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 11/21] staging: r8188eu: make blink interval defines internal Date: Sun, 26 Dec 2021 20:55:46 +0100 Message-Id: <20211226195556.159471-12-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The defines for led blink intervals are used only by the led layer. Move them into rtw_led.c. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 6 ++++++ drivers/staging/r8188eu/include/rtw_led.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 7eade85302c8..8223bddc490b 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -5,6 +5,12 @@ #include "../include/rtw_led.h" #include "../include/rtl8188e_spec.h" =20 +#define LED_BLINK_NO_LINK_INTVL msecs_to_jiffies(1000) +#define LED_BLINK_LINK_INTVL msecs_to_jiffies(500) +#define LED_BLINK_SCAN_INTVL msecs_to_jiffies(180) +#define LED_BLINK_FASTER_INTVL msecs_to_jiffies(50) +#define LED_BLINK_WPS_SUCESS_INTVL msecs_to_jiffies(5000) + #define IS_LED_WPS_BLINKING(l) \ ((l)->CurrLedState =3D=3D LED_BLINK_WPS || \ (l)->CurrLedState =3D=3D LED_BLINK_WPS_STOP || \ diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/include/rtw_led.h index fd7b0cbd64ac..6f44da69c3c9 100644 --- a/drivers/staging/r8188eu/include/rtw_led.h +++ b/drivers/staging/r8188eu/include/rtw_led.h @@ -7,12 +7,6 @@ #include "osdep_service.h" #include "drv_types.h" =20 -#define LED_BLINK_NO_LINK_INTVL msecs_to_jiffies(1000) -#define LED_BLINK_LINK_INTVL msecs_to_jiffies(500) -#define LED_BLINK_SCAN_INTVL msecs_to_jiffies(180) -#define LED_BLINK_FASTER_INTVL msecs_to_jiffies(50) -#define LED_BLINK_WPS_SUCESS_INTVL msecs_to_jiffies(5000) - enum LED_CTL_MODE { LED_CTL_POWER_ON =3D 1, LED_CTL_LINK =3D 2, --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13C2DC433F5 for ; Sun, 26 Dec 2021 19:56:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234393AbhLZT4k (ORCPT ); Sun, 26 Dec 2021 14:56:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234390AbhLZT4Z (ORCPT ); Sun, 26 Dec 2021 14:56:25 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6425C061759 for ; Sun, 26 Dec 2021 11:56:24 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zcy-0000Fz-Na; Sun, 26 Dec 2021 20:56:20 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 12/21] staging: r8188eu: use bool for boolean values Date: Sun, 26 Dec 2021 20:55:47 +0100 Message-Id: <20211226195556.159471-13-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Change some boolean variables from u8 to bool. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_led.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/include/rtw_led.h index 6f44da69c3c9..ffd23b73f852 100644 --- a/drivers/staging/r8188eu/include/rtw_led.h +++ b/drivers/staging/r8188eu/include/rtw_led.h @@ -46,18 +46,18 @@ struct LED_871x { enum LED_STATE_871x BlinkingLedState; /* Next state for blinking, * either RTW_LED_ON or RTW_LED_OFF are. */ =20 - u8 bLedOn; /* true if LED is ON, false if LED is OFF. */ + bool bLedOn; /* true if LED is ON, false if LED is OFF. */ =20 - u8 bLedBlinkInProgress; /* true if it is blinking, false o.w.. */ + bool bLedBlinkInProgress; /* true if it is blinking, false o.w.. */ =20 - u8 bLedWPSBlinkInProgress; + bool bLedWPSBlinkInProgress; =20 u32 BlinkTimes; /* Number of times to toggle led state for blinking. */ =20 /* ALPHA, added by chiyoko, 20090106 */ - u8 bLedNoLinkBlinkInProgress; - u8 bLedLinkBlinkInProgress; - u8 bLedScanBlinkInProgress; + bool bLedNoLinkBlinkInProgress; + bool bLedLinkBlinkInProgress; + bool bLedScanBlinkInProgress; struct delayed_work blink_work; }; =20 @@ -66,7 +66,7 @@ void LedControl8188eu(struct adapter *padapter, enum LED_= CTL_MODE LedAction); struct led_priv{ /* add for led control */ struct LED_871x SwLed0; - u8 bRegUseLed; + bool bRegUseLed; void (*LedControlHandler)(struct adapter *padapter, enum LED_CTL_MODE LedAction); /* add for led control */ --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE25EC433EF for ; Sun, 26 Dec 2021 19:56:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234419AbhLZT4n (ORCPT ); Sun, 26 Dec 2021 14:56:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234404AbhLZT4Z (ORCPT ); Sun, 26 Dec 2021 14:56:25 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E043C06173E for ; Sun, 26 Dec 2021 11:56:25 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zcz-0000Fz-MT; Sun, 26 Dec 2021 20:56:21 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 13/21] staging: r8188eu: remove obsolete comments Date: Sun, 26 Dec 2021 20:55:48 +0100 Message-Id: <20211226195556.159471-14-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove some comments that don't make sense any more. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_led.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/include/rtw_led.h index ffd23b73f852..2672ab165784 100644 --- a/drivers/staging/r8188eu/include/rtw_led.h +++ b/drivers/staging/r8188eu/include/rtw_led.h @@ -18,8 +18,8 @@ enum LED_CTL_MODE { LED_CTL_START_TO_LINK =3D 8, LED_CTL_START_WPS =3D 9, LED_CTL_STOP_WPS =3D 10, - LED_CTL_START_WPS_BOTTON =3D 11, /* added for runtop */ - LED_CTL_STOP_WPS_FAIL =3D 12, /* added for ALPHA */ + LED_CTL_START_WPS_BOTTON =3D 11, + LED_CTL_STOP_WPS_FAIL =3D 12, }; =20 enum LED_STATE_871x { @@ -35,7 +35,7 @@ enum LED_STATE_871x { * Server case */ LED_BLINK_TXRX =3D 9, LED_BLINK_WPS =3D 10, /* LED is blinkg during WPS communication */ - LED_BLINK_WPS_STOP =3D 11, /* for ALPHA */ + LED_BLINK_WPS_STOP =3D 11, LED_BLINK_RUNTOP =3D 13, /* Customized for RunTop */ }; =20 @@ -54,7 +54,6 @@ struct LED_871x { =20 u32 BlinkTimes; /* Number of times to toggle led state for blinking. */ =20 - /* ALPHA, added by chiyoko, 20090106 */ bool bLedNoLinkBlinkInProgress; bool bLedLinkBlinkInProgress; bool bLedScanBlinkInProgress; @@ -64,12 +63,10 @@ struct LED_871x { void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE LedActio= n); =20 struct led_priv{ - /* add for led control */ struct LED_871x SwLed0; bool bRegUseLed; void (*LedControlHandler)(struct adapter *padapter, enum LED_CTL_MODE LedAction); - /* add for led control */ }; =20 #define rtw_led_control(adapt, action) \ --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED5F9C433EF for ; Sun, 26 Dec 2021 19:56:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234543AbhLZT4p (ORCPT ); Sun, 26 Dec 2021 14:56:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234405AbhLZT40 (ORCPT ); Sun, 26 Dec 2021 14:56:26 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88A2FC06173E for ; Sun, 26 Dec 2021 11:56:26 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zd0-0000Fz-K0; Sun, 26 Dec 2021 20:56:22 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 14/21] staging: r8188eu: remove LedControlHandler Date: Sun, 26 Dec 2021 20:55:49 +0100 Message-Id: <20211226195556.159471-15-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Export the function that other layers use for setting the led. Remove the function pointer and the macro to make the led control function configurable. This driver supports only a single configuration. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 4 +--- drivers/staging/r8188eu/include/rtw_led.h | 12 ++---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 8223bddc490b..86c6c1a3b8bf 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -411,8 +411,6 @@ void rtl8188eu_InitSwLeds(struct adapter *padapter) struct led_priv *pledpriv =3D &padapter->ledpriv; struct LED_871x *pLed =3D &pledpriv->SwLed0; =20 - pledpriv->LedControlHandler =3D LedControl8188eu; - pLed->padapter =3D padapter; ResetLedStatus(pLed); INIT_DELAYED_WORK(&pLed->blink_work, blink_work); @@ -428,7 +426,7 @@ void rtl8188eu_DeInitSwLeds(struct adapter *padapter) SwLedOff(padapter, pLed); } =20 -void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE LedActio= n) +void rtw_led_control(struct adapter *padapter, enum LED_CTL_MODE LedAction) { struct led_priv *ledpriv =3D &padapter->ledpriv; struct registry_priv *registry_par; diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/include/rtw_led.h index 2672ab165784..5c7b33e70732 100644 --- a/drivers/staging/r8188eu/include/rtw_led.h +++ b/drivers/staging/r8188eu/include/rtw_led.h @@ -60,22 +60,14 @@ struct LED_871x { struct delayed_work blink_work; }; =20 -void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE LedActio= n); - struct led_priv{ struct LED_871x SwLed0; bool bRegUseLed; - void (*LedControlHandler)(struct adapter *padapter, - enum LED_CTL_MODE LedAction); }; =20 -#define rtw_led_control(adapt, action) \ - do { \ - if ((adapt)->ledpriv.LedControlHandler) \ - (adapt)->ledpriv.LedControlHandler((adapt), (action)); \ - } while (0) - void rtl8188eu_InitSwLeds(struct adapter *padapter); void rtl8188eu_DeInitSwLeds(struct adapter *padapter); =20 +void rtw_led_control(struct adapter *padapter, enum LED_CTL_MODE LedAction= ); + #endif /* __RTW_LED_H_ */ --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11E59C433EF for ; Sun, 26 Dec 2021 19:56:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234594AbhLZT4v (ORCPT ); Sun, 26 Dec 2021 14:56:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234424AbhLZT41 (ORCPT ); Sun, 26 Dec 2021 14:56:27 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E83FC06173E for ; Sun, 26 Dec 2021 11:56:27 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zd1-0000Fz-IC; Sun, 26 Dec 2021 20:56:23 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 15/21] staging: r8188eu: LED_CTL_POWER_ON is not used Date: Sun, 26 Dec 2021 20:55:50 +0100 Message-Id: <20211226195556.159471-16-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The LED_CTL_POWER_ON mode is not used by this driver. Remove the define and related dead code. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 4 +--- drivers/staging/r8188eu/include/rtw_led.h | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 86c6c1a3b8bf..42d7a645389a 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -197,7 +197,6 @@ static void SwLedControlMode1(struct adapter *padapter,= enum LED_CTL_MODE LedAct struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; =20 switch (LedAction) { - case LED_CTL_POWER_ON: case LED_CTL_START_TO_LINK: case LED_CTL_NO_LINK: if (!pLed->bLedNoLinkBlinkInProgress) { @@ -447,8 +446,7 @@ void rtw_led_control(struct adapter *padapter, enum LED= _CTL_MODE LedAction) (LedAction =3D=3D LED_CTL_TX || LedAction =3D=3D LED_CTL_RX || LedAction =3D=3D LED_CTL_SITE_SURVEY || LedAction =3D=3D LED_CTL_LINK || - LedAction =3D=3D LED_CTL_NO_LINK || - LedAction =3D=3D LED_CTL_POWER_ON)) + LedAction =3D=3D LED_CTL_NO_LINK)) return; =20 SwLedControlMode1(padapter, LedAction); diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/include/rtw_led.h index 5c7b33e70732..e170db6f3e37 100644 --- a/drivers/staging/r8188eu/include/rtw_led.h +++ b/drivers/staging/r8188eu/include/rtw_led.h @@ -8,7 +8,6 @@ #include "drv_types.h" =20 enum LED_CTL_MODE { - LED_CTL_POWER_ON =3D 1, LED_CTL_LINK =3D 2, LED_CTL_NO_LINK =3D 3, LED_CTL_TX =3D 4, --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6851C433EF for ; Sun, 26 Dec 2021 19:56:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234519AbhLZT4y (ORCPT ); Sun, 26 Dec 2021 14:56:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234367AbhLZT42 (ORCPT ); Sun, 26 Dec 2021 14:56:28 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76B18C061401 for ; Sun, 26 Dec 2021 11:56:28 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zd2-0000Fz-JT; Sun, 26 Dec 2021 20:56:24 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 16/21] staging: r8188eu: LED_CTL_START_WPS_BOTTON is not used Date: Sun, 26 Dec 2021 20:55:51 +0100 Message-Id: <20211226195556.159471-17-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" None of the callers sets LED_CTL_START_WPS_BOTTON. Remove the define and related dead code. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 1 - drivers/staging/r8188eu/include/rtw_led.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 42d7a645389a..20e805718557 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -293,7 +293,6 @@ static void SwLedControlMode1(struct adapter *padapter,= enum LED_CTL_MODE LedAct } break; case LED_CTL_START_WPS: /* wait until xinpin finish */ - case LED_CTL_START_WPS_BOTTON: if (!pLed->bLedWPSBlinkInProgress) { if (pLed->bLedNoLinkBlinkInProgress) { cancel_delayed_work(&pLed->blink_work); diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8= 188eu/include/rtw_led.h index e170db6f3e37..2c14cb23d9ad 100644 --- a/drivers/staging/r8188eu/include/rtw_led.h +++ b/drivers/staging/r8188eu/include/rtw_led.h @@ -17,7 +17,6 @@ enum LED_CTL_MODE { LED_CTL_START_TO_LINK =3D 8, LED_CTL_START_WPS =3D 9, LED_CTL_STOP_WPS =3D 10, - LED_CTL_START_WPS_BOTTON =3D 11, LED_CTL_STOP_WPS_FAIL =3D 12, }; =20 --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 001B8C433F5 for ; Sun, 26 Dec 2021 19:57:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232453AbhLZT5D (ORCPT ); Sun, 26 Dec 2021 14:57:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234446AbhLZT4b (ORCPT ); Sun, 26 Dec 2021 14:56:31 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1162FC06175F for ; Sun, 26 Dec 2021 11:56:30 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zd3-0000Fz-Jo; Sun, 26 Dec 2021 20:56:25 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 17/21] staging: r8188eu: remove bStopBlinking Date: Sun, 26 Dec 2021 20:55:52 +0100 Message-Id: <20211226195556.159471-18-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove the temporary variable bStopBlinking and check the conditions directly in the if clauses. There's no need to save the result of these checks. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 20e805718557..e554fef89c56 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -66,7 +66,6 @@ static void SwLedBlink1(struct LED_871x *pLed) { struct adapter *padapter =3D pLed->padapter; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - u8 bStopBlinking =3D false; =20 /* Change LED according to BlinkingLedState specified. */ if (pLed->BlinkingLedState =3D=3D RTW_LED_ON) @@ -97,9 +96,7 @@ static void SwLedBlink1(struct LED_871x *pLed) break; case LED_BLINK_SCAN: pLed->BlinkTimes--; - if (pLed->BlinkTimes =3D=3D 0) - bStopBlinking =3D true; - if (bStopBlinking) { + if (pLed->BlinkTimes =3D=3D 0) { if (check_fwstate(pmlmepriv, _FW_LINKED)) { pLed->bLedLinkBlinkInProgress =3D true; pLed->CurrLedState =3D LED_BLINK_NORMAL; @@ -128,9 +125,7 @@ static void SwLedBlink1(struct LED_871x *pLed) break; case LED_BLINK_TXRX: pLed->BlinkTimes--; - if (pLed->BlinkTimes =3D=3D 0) - bStopBlinking =3D true; - if (bStopBlinking) { + if (pLed->BlinkTimes =3D=3D 0) { if (check_fwstate(pmlmepriv, _FW_LINKED)) { pLed->bLedLinkBlinkInProgress =3D true; pLed->CurrLedState =3D LED_BLINK_NORMAL; @@ -165,12 +160,7 @@ static void SwLedBlink1(struct LED_871x *pLed) schedule_delayed_work(&pLed->blink_work, LED_BLINK_SCAN_INTVL); break; case LED_BLINK_WPS_STOP: /* WPS success */ - if (pLed->BlinkingLedState =3D=3D RTW_LED_ON) - bStopBlinking =3D false; - else - bStopBlinking =3D true; - - if (bStopBlinking) { + if (pLed->BlinkingLedState !=3D RTW_LED_ON) { pLed->bLedLinkBlinkInProgress =3D true; pLed->CurrLedState =3D LED_BLINK_NORMAL; if (pLed->bLedOn) --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9775C433F5 for ; Sun, 26 Dec 2021 19:56:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234422AbhLZT44 (ORCPT ); Sun, 26 Dec 2021 14:56:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234475AbhLZT4c (ORCPT ); Sun, 26 Dec 2021 14:56:32 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8BDDC061785 for ; Sun, 26 Dec 2021 11:56:30 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zd4-0000Fz-JW; Sun, 26 Dec 2021 20:56:26 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 18/21] staging: r8188eu: summarize some BlinkingLedState Date: Sun, 26 Dec 2021 20:55:53 +0100 Message-Id: <20211226195556.159471-19-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Move BlinkingLedState updates out of if clauses where the same update is done for all possible paths. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 32 +++++++------------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index e554fef89c56..d1fdd5a4a3ad 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -95,60 +95,44 @@ static void SwLedBlink1(struct LED_871x *pLed) schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); break; case LED_BLINK_SCAN: + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; pLed->BlinkTimes--; if (pLed->BlinkTimes =3D=3D 0) { if (check_fwstate(pmlmepriv, _FW_LINKED)) { pLed->bLedLinkBlinkInProgress =3D true; pLed->CurrLedState =3D LED_BLINK_NORMAL; - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { pLed->bLedNoLinkBlinkInProgress =3D true; pLed->CurrLedState =3D LED_BLINK_SLOWLY; - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); } pLed->bLedScanBlinkInProgress =3D false; } else { - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; schedule_delayed_work(&pLed->blink_work, LED_BLINK_SCAN_INTVL); } break; case LED_BLINK_TXRX: + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; pLed->BlinkTimes--; if (pLed->BlinkTimes =3D=3D 0) { if (check_fwstate(pmlmepriv, _FW_LINKED)) { pLed->bLedLinkBlinkInProgress =3D true; pLed->CurrLedState =3D LED_BLINK_NORMAL; - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { pLed->bLedNoLinkBlinkInProgress =3D true; pLed->CurrLedState =3D LED_BLINK_SLOWLY; - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); } pLed->bLedBlinkInProgress =3D false; } else { - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; schedule_delayed_work(&pLed->blink_work, LED_BLINK_FASTER_INTVL); } break; --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2FAAC433EF for ; Sun, 26 Dec 2021 19:57:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234622AbhLZT5B (ORCPT ); Sun, 26 Dec 2021 14:57:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234427AbhLZT4c (ORCPT ); Sun, 26 Dec 2021 14:56:32 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9625DC061401 for ; Sun, 26 Dec 2021 11:56:32 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zd5-0000Fz-Ks; Sun, 26 Dec 2021 20:56:27 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 19/21] staging: r8188eu: merge blink_work and SwLedBlink1 Date: Sun, 26 Dec 2021 20:55:54 +0100 Message-Id: <20211226195556.159471-20-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" blink_work is the only caller of SwLedBlink1. Merge the two functions. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 199 ++++++++++++------------- 1 file changed, 96 insertions(+), 103 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index d1fdd5a4a3ad..2b550e5821e0 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -62,108 +62,6 @@ static void SwLedOff(struct adapter *padapter, struct L= ED_871x *pLed) pLed->bLedOn =3D false; } =20 -static void SwLedBlink1(struct LED_871x *pLed) -{ - struct adapter *padapter =3D pLed->padapter; - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - - /* Change LED according to BlinkingLedState specified. */ - if (pLed->BlinkingLedState =3D=3D RTW_LED_ON) - SwLedOn(padapter, pLed); - else - SwLedOff(padapter, pLed); - - if (padapter->pwrctrlpriv.rf_pwrstate !=3D rf_on) { - SwLedOff(padapter, pLed); - ResetLedStatus(pLed); - return; - } - - switch (pLed->CurrLedState) { - case LED_BLINK_SLOWLY: - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); - break; - case LED_BLINK_NORMAL: - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); - break; - case LED_BLINK_SCAN: - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - pLed->BlinkTimes--; - if (pLed->BlinkTimes =3D=3D 0) { - if (check_fwstate(pmlmepriv, _FW_LINKED)) { - pLed->bLedLinkBlinkInProgress =3D true; - pLed->CurrLedState =3D LED_BLINK_NORMAL; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); - } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { - pLed->bLedNoLinkBlinkInProgress =3D true; - pLed->CurrLedState =3D LED_BLINK_SLOWLY; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); - } - pLed->bLedScanBlinkInProgress =3D false; - } else { - schedule_delayed_work(&pLed->blink_work, LED_BLINK_SCAN_INTVL); - } - break; - case LED_BLINK_TXRX: - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - pLed->BlinkTimes--; - if (pLed->BlinkTimes =3D=3D 0) { - if (check_fwstate(pmlmepriv, _FW_LINKED)) { - pLed->bLedLinkBlinkInProgress =3D true; - pLed->CurrLedState =3D LED_BLINK_NORMAL; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); - } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { - pLed->bLedNoLinkBlinkInProgress =3D true; - pLed->CurrLedState =3D LED_BLINK_SLOWLY; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); - } - pLed->bLedBlinkInProgress =3D false; - } else { - schedule_delayed_work(&pLed->blink_work, LED_BLINK_FASTER_INTVL); - } - break; - case LED_BLINK_WPS: - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_SCAN_INTVL); - break; - case LED_BLINK_WPS_STOP: /* WPS success */ - if (pLed->BlinkingLedState !=3D RTW_LED_ON) { - pLed->bLedLinkBlinkInProgress =3D true; - pLed->CurrLedState =3D LED_BLINK_NORMAL; - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); - - pLed->bLedWPSBlinkInProgress =3D false; - } else { - pLed->BlinkingLedState =3D RTW_LED_OFF; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_WPS_SUCESS_INTVL); - } - break; - default: - break; - } -} - static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE = LedAction) { struct led_priv *ledpriv =3D &padapter->ledpriv; @@ -371,11 +269,106 @@ static void blink_work(struct work_struct *work) struct delayed_work *dwork =3D to_delayed_work(work); struct LED_871x *pLed =3D container_of(dwork, struct LED_871x, blink_work= ); struct adapter *padapter =3D pLed->padapter; + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; =20 if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped)) return; =20 - SwLedBlink1(pLed); + /* Change LED according to BlinkingLedState specified. */ + if (pLed->BlinkingLedState =3D=3D RTW_LED_ON) + SwLedOn(padapter, pLed); + else + SwLedOff(padapter, pLed); + + if (padapter->pwrctrlpriv.rf_pwrstate !=3D rf_on) { + SwLedOff(padapter, pLed); + ResetLedStatus(pLed); + return; + } + + switch (pLed->CurrLedState) { + case LED_BLINK_SLOWLY: + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); + break; + case LED_BLINK_NORMAL: + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); + break; + case LED_BLINK_SCAN: + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + pLed->BlinkTimes--; + if (pLed->BlinkTimes =3D=3D 0) { + if (check_fwstate(pmlmepriv, _FW_LINKED)) { + pLed->bLedLinkBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_NORMAL; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); + } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { + pLed->bLedNoLinkBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_SLOWLY; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); + } + pLed->bLedScanBlinkInProgress =3D false; + } else { + schedule_delayed_work(&pLed->blink_work, LED_BLINK_SCAN_INTVL); + } + break; + case LED_BLINK_TXRX: + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + pLed->BlinkTimes--; + if (pLed->BlinkTimes =3D=3D 0) { + if (check_fwstate(pmlmepriv, _FW_LINKED)) { + pLed->bLedLinkBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_NORMAL; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); + } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { + pLed->bLedNoLinkBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_SLOWLY; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); + } + pLed->bLedBlinkInProgress =3D false; + } else { + schedule_delayed_work(&pLed->blink_work, LED_BLINK_FASTER_INTVL); + } + break; + case LED_BLINK_WPS: + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_SCAN_INTVL); + break; + case LED_BLINK_WPS_STOP: /* WPS success */ + if (pLed->BlinkingLedState !=3D RTW_LED_ON) { + pLed->bLedLinkBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_NORMAL; + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); + + pLed->bLedWPSBlinkInProgress =3D false; + } else { + pLed->BlinkingLedState =3D RTW_LED_OFF; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_WPS_SUCESS_INTVL); + } + break; + default: + break; + } } =20 void rtl8188eu_InitSwLeds(struct adapter *padapter) --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08776C433F5 for ; Sun, 26 Dec 2021 20:08:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232644AbhLZUIm (ORCPT ); Sun, 26 Dec 2021 15:08:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229600AbhLZUIl (ORCPT ); Sun, 26 Dec 2021 15:08:41 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93805C06173E for ; Sun, 26 Dec 2021 12:08:41 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zd6-0000Fz-MP; Sun, 26 Dec 2021 20:56:28 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 20/21] staging: r8188eu: merge rtw_led_control and SwLedControlMode1 Date: Sun, 26 Dec 2021 20:55:55 +0100 Message-Id: <20211226195556.159471-21-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" rtw_led_control is the only caller of SwLedControlMode1. Pull SwLedControlMode1 into rtw_led_control. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 303 ++++++++++++------------- 1 file changed, 148 insertions(+), 155 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 2b550e5821e0..09a9676eb503 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -62,12 +62,159 @@ static void SwLedOff(struct adapter *padapter, struct = LED_871x *pLed) pLed->bLedOn =3D false; } =20 -static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE = LedAction) +static void blink_work(struct work_struct *work) +{ + struct delayed_work *dwork =3D to_delayed_work(work); + struct LED_871x *pLed =3D container_of(dwork, struct LED_871x, blink_work= ); + struct adapter *padapter =3D pLed->padapter; + struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; + + if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped)) + return; + + if (padapter->pwrctrlpriv.rf_pwrstate !=3D rf_on) { + SwLedOff(padapter, pLed); + ResetLedStatus(pLed); + return; + } + + /* Change LED according to BlinkingLedState specified. */ + if (pLed->BlinkingLedState =3D=3D RTW_LED_ON) + SwLedOn(padapter, pLed); + else + SwLedOff(padapter, pLed); + + switch (pLed->CurrLedState) { + case LED_BLINK_SLOWLY: + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); + break; + case LED_BLINK_NORMAL: + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); + break; + case LED_BLINK_SCAN: + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + pLed->BlinkTimes--; + if (pLed->BlinkTimes =3D=3D 0) { + if (check_fwstate(pmlmepriv, _FW_LINKED)) { + pLed->bLedLinkBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_NORMAL; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); + } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { + pLed->bLedNoLinkBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_SLOWLY; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); + } + pLed->bLedScanBlinkInProgress =3D false; + } else { + schedule_delayed_work(&pLed->blink_work, LED_BLINK_SCAN_INTVL); + } + break; + case LED_BLINK_TXRX: + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + pLed->BlinkTimes--; + if (pLed->BlinkTimes =3D=3D 0) { + if (check_fwstate(pmlmepriv, _FW_LINKED)) { + pLed->bLedLinkBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_NORMAL; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); + } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { + pLed->bLedNoLinkBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_SLOWLY; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); + } + pLed->bLedBlinkInProgress =3D false; + } else { + schedule_delayed_work(&pLed->blink_work, LED_BLINK_FASTER_INTVL); + } + break; + case LED_BLINK_WPS: + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_SCAN_INTVL); + break; + case LED_BLINK_WPS_STOP: /* WPS success */ + if (pLed->BlinkingLedState !=3D RTW_LED_ON) { + pLed->bLedLinkBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_NORMAL; + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); + + pLed->bLedWPSBlinkInProgress =3D false; + } else { + pLed->BlinkingLedState =3D RTW_LED_OFF; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_WPS_SUCESS_INTVL); + } + break; + default: + break; + } +} + +void rtl8188eu_InitSwLeds(struct adapter *padapter) +{ + struct led_priv *pledpriv =3D &padapter->ledpriv; + struct LED_871x *pLed =3D &pledpriv->SwLed0; + + pLed->padapter =3D padapter; + ResetLedStatus(pLed); + INIT_DELAYED_WORK(&pLed->blink_work, blink_work); +} + +void rtl8188eu_DeInitSwLeds(struct adapter *padapter) +{ + struct led_priv *ledpriv =3D &padapter->ledpriv; + struct LED_871x *pLed =3D &ledpriv->SwLed0; + + cancel_delayed_work_sync(&pLed->blink_work); + ResetLedStatus(pLed); + SwLedOff(padapter, pLed); +} + +void rtw_led_control(struct adapter *padapter, enum LED_CTL_MODE LedAction) { struct led_priv *ledpriv =3D &padapter->ledpriv; + struct registry_priv *registry_par; struct LED_871x *pLed =3D &ledpriv->SwLed0; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; =20 + if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped) || + (!padapter->hw_init_completed)) + return; + + if (!ledpriv->bRegUseLed) + return; + + registry_par =3D &padapter->registrypriv; + if (!registry_par->led_enable) + return; + + if ((padapter->pwrctrlpriv.rf_pwrstate !=3D rf_on && + padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) && + (LedAction =3D=3D LED_CTL_TX || LedAction =3D=3D LED_CTL_RX || + LedAction =3D=3D LED_CTL_SITE_SURVEY || + LedAction =3D=3D LED_CTL_LINK || + LedAction =3D=3D LED_CTL_NO_LINK)) + return; + switch (LedAction) { case LED_CTL_START_TO_LINK: case LED_CTL_NO_LINK: @@ -263,157 +410,3 @@ static void SwLedControlMode1(struct adapter *padapte= r, enum LED_CTL_MODE LedAct break; } } - -static void blink_work(struct work_struct *work) -{ - struct delayed_work *dwork =3D to_delayed_work(work); - struct LED_871x *pLed =3D container_of(dwork, struct LED_871x, blink_work= ); - struct adapter *padapter =3D pLed->padapter; - struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; - - if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped)) - return; - - /* Change LED according to BlinkingLedState specified. */ - if (pLed->BlinkingLedState =3D=3D RTW_LED_ON) - SwLedOn(padapter, pLed); - else - SwLedOff(padapter, pLed); - - if (padapter->pwrctrlpriv.rf_pwrstate !=3D rf_on) { - SwLedOff(padapter, pLed); - ResetLedStatus(pLed); - return; - } - - switch (pLed->CurrLedState) { - case LED_BLINK_SLOWLY: - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); - break; - case LED_BLINK_NORMAL: - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); - break; - case LED_BLINK_SCAN: - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - pLed->BlinkTimes--; - if (pLed->BlinkTimes =3D=3D 0) { - if (check_fwstate(pmlmepriv, _FW_LINKED)) { - pLed->bLedLinkBlinkInProgress =3D true; - pLed->CurrLedState =3D LED_BLINK_NORMAL; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); - } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { - pLed->bLedNoLinkBlinkInProgress =3D true; - pLed->CurrLedState =3D LED_BLINK_SLOWLY; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); - } - pLed->bLedScanBlinkInProgress =3D false; - } else { - schedule_delayed_work(&pLed->blink_work, LED_BLINK_SCAN_INTVL); - } - break; - case LED_BLINK_TXRX: - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - pLed->BlinkTimes--; - if (pLed->BlinkTimes =3D=3D 0) { - if (check_fwstate(pmlmepriv, _FW_LINKED)) { - pLed->bLedLinkBlinkInProgress =3D true; - pLed->CurrLedState =3D LED_BLINK_NORMAL; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); - } else if (!check_fwstate(pmlmepriv, _FW_LINKED)) { - pLed->bLedNoLinkBlinkInProgress =3D true; - pLed->CurrLedState =3D LED_BLINK_SLOWLY; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); - } - pLed->bLedBlinkInProgress =3D false; - } else { - schedule_delayed_work(&pLed->blink_work, LED_BLINK_FASTER_INTVL); - } - break; - case LED_BLINK_WPS: - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_SCAN_INTVL); - break; - case LED_BLINK_WPS_STOP: /* WPS success */ - if (pLed->BlinkingLedState !=3D RTW_LED_ON) { - pLed->bLedLinkBlinkInProgress =3D true; - pLed->CurrLedState =3D LED_BLINK_NORMAL; - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); - - pLed->bLedWPSBlinkInProgress =3D false; - } else { - pLed->BlinkingLedState =3D RTW_LED_OFF; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_WPS_SUCESS_INTVL); - } - break; - default: - break; - } -} - -void rtl8188eu_InitSwLeds(struct adapter *padapter) -{ - struct led_priv *pledpriv =3D &padapter->ledpriv; - struct LED_871x *pLed =3D &pledpriv->SwLed0; - - pLed->padapter =3D padapter; - ResetLedStatus(pLed); - INIT_DELAYED_WORK(&pLed->blink_work, blink_work); -} - -void rtl8188eu_DeInitSwLeds(struct adapter *padapter) -{ - struct led_priv *ledpriv =3D &padapter->ledpriv; - struct LED_871x *pLed =3D &ledpriv->SwLed0; - - cancel_delayed_work_sync(&pLed->blink_work); - ResetLedStatus(pLed); - SwLedOff(padapter, pLed); -} - -void rtw_led_control(struct adapter *padapter, enum LED_CTL_MODE LedAction) -{ - struct led_priv *ledpriv =3D &padapter->ledpriv; - struct registry_priv *registry_par; - - if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped) || - (!padapter->hw_init_completed)) - return; - - if (!ledpriv->bRegUseLed) - return; - - registry_par =3D &padapter->registrypriv; - if (!registry_par->led_enable) - return; - - if ((padapter->pwrctrlpriv.rf_pwrstate !=3D rf_on && - padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) && - (LedAction =3D=3D LED_CTL_TX || LedAction =3D=3D LED_CTL_RX || - LedAction =3D=3D LED_CTL_SITE_SURVEY || - LedAction =3D=3D LED_CTL_LINK || - LedAction =3D=3D LED_CTL_NO_LINK)) - return; - - SwLedControlMode1(padapter, LedAction); -} --=20 2.30.2 From nobody Wed Jul 1 07:51:48 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2EE1C433EF for ; Sun, 26 Dec 2021 20:08:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232690AbhLZUIu (ORCPT ); Sun, 26 Dec 2021 15:08:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232678AbhLZUIt (ORCPT ); Sun, 26 Dec 2021 15:08:49 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15F47C06173E for ; Sun, 26 Dec 2021 12:08:49 -0800 (PST) Received: from dslb-188-097-047-111.188.097.pools.vodafone-ip.de ([188.97.47.111] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1n1Zd7-0000Fz-Rq; Sun, 26 Dec 2021 20:56:29 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 21/21] staging: r8188eu: rfoff_reason is never initialised Date: Sun, 26 Dec 2021 20:55:56 +0100 Message-Id: <20211226195556.159471-22-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211226195556.159471-1-martin@kaiser.cx> References: <20211226195556.159471-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" rfoff_reason in struct pwrctrl_priv is never set, its value remains 0. Remove rfoff_reason, related defines and a check in rtw_led_control that is always false. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_led.c | 8 -------- drivers/staging/r8188eu/include/hal_intf.h | 6 ------ drivers/staging/r8188eu/include/rtw_pwrctrl.h | 1 - 3 files changed, 15 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 09a9676eb503..ccd43accb7dc 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -207,14 +207,6 @@ void rtw_led_control(struct adapter *padapter, enum LE= D_CTL_MODE LedAction) if (!registry_par->led_enable) return; =20 - if ((padapter->pwrctrlpriv.rf_pwrstate !=3D rf_on && - padapter->pwrctrlpriv.rfoff_reason > RF_CHANGE_BY_PS) && - (LedAction =3D=3D LED_CTL_TX || LedAction =3D=3D LED_CTL_RX || - LedAction =3D=3D LED_CTL_SITE_SURVEY || - LedAction =3D=3D LED_CTL_LINK || - LedAction =3D=3D LED_CTL_NO_LINK)) - return; - switch (LedAction) { case LED_CTL_START_TO_LINK: case LED_CTL_NO_LINK: diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 6eb630f9b6bf..b5474d199c10 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -100,12 +100,6 @@ enum hal_odm_variable { =20 typedef s32 (*c2h_id_filter)(u8 id); =20 -#define RF_CHANGE_BY_INIT 0 -#define RF_CHANGE_BY_IPS BIT(28) -#define RF_CHANGE_BY_PS BIT(29) -#define RF_CHANGE_BY_HW BIT(30) -#define RF_CHANGE_BY_SW BIT(31) - #define is_boot_from_eeprom(adapter) (adapter->eeprompriv.EepromOrEfuse) =20 void rtl8188eu_interface_configure(struct adapter *adapt); diff --git a/drivers/staging/r8188eu/include/rtw_pwrctrl.h b/drivers/stagin= g/r8188eu/include/rtw_pwrctrl.h index a71f2f8f7c43..849e144c90dd 100644 --- a/drivers/staging/r8188eu/include/rtw_pwrctrl.h +++ b/drivers/staging/r8188eu/include/rtw_pwrctrl.h @@ -57,7 +57,6 @@ struct pwrctrl_priv { =20 u8 reg_rfoff; u8 reg_pdnmode; /* powerdown mode */ - u32 rfoff_reason; =20 /* RF OFF Level */ u32 cur_ps_level; --=20 2.30.2