From: Martin Kaiser Date: Sun, 26 Dec 2021 19:55:40 +0000 (+0100) Subject: staging: r8188eu: merge DeInitLed871x and rtl8188eu_DeInitSwLeds X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0b8d8a17d628146a0bb2a769f6135e0212643b3a;p=linux.git staging: r8188eu: merge DeInitLed871x and rtl8188eu_DeInitSwLeds Merge DeInitLed871x and rtl8188eu_DeInitSwLeds, both of which are small and simple. Signed-off-by: Martin Kaiser Link: https://lore.kernel.org/r/20211226195556.159471-6-martin@kaiser.cx Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188eu/core/rtw_led.c index 541aba6faaf00..1eb70f33c1583 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -59,13 +59,6 @@ exit: pLed->bLedOn = false; } -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 = pLed->padapter; @@ -423,8 +416,11 @@ void rtl8188eu_InitSwLeds(struct adapter *padapter) void rtl8188eu_DeInitSwLeds(struct adapter *padapter) { struct led_priv *ledpriv = &padapter->ledpriv; + struct LED_871x *pLed = &ledpriv->SwLed0; - DeInitLed871x(&ledpriv->SwLed0); + cancel_delayed_work_sync(&pLed->blink_work); + ResetLedStatus(pLed); + SwLedOff(padapter, pLed); } void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE LedAction) diff --git a/drivers/staging/r8188eu/include/rtw_led.h b/drivers/staging/r8188eu/include/rtw_led.h index 2c4dc361e4691..ed8574c882884 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); void ResetLedStatus(struct LED_871x * pLed); -void DeInitLed871x(struct LED_871x *pLed); - void rtl8188eu_InitSwLeds(struct adapter *padapter); void rtl8188eu_DeInitSwLeds(struct adapter *padapter);