Elminate multiple layers of wrappers for work handling

[android-x86/external-modules-rtl8723au.git] / core / rtw_led.c

diff --git a/core/rtw_led.c b/core/rtw_led.c
index e899dcc..e748305 100644 (file)
--- a/core/rtw_led.c
+++ b/core/rtw_led.c
@@ -38,16 +38,13 @@ void BlinkTimerCallback(void *data)
                return;
        }
 
-#if defined(CONFIG_USB_HCI)
-       #ifdef CONFIG_LED_HANDLED_BY_CMD_THREAD
+#ifdef CONFIG_LED_HANDLED_BY_CMD_THREAD
        rtw_led_blink_cmd(padapter, pLed);
-       #else
-       _set_workitem(&(pLed->BlinkWorkItem));
-       #endif
+#else
+       schedule_work(&(pLed->BlinkWorkItem));
 #endif
 }
 
-#if defined(CONFIG_USB_HCI)
 /*  */
 /*     Description: */
 /*             Callback function of LED BlinkWorkItem. */
@@ -58,7 +55,6 @@ void BlinkWorkItemCallback(struct work_struct *work)
        PLED_871x        pLed = container_of(work, LED_871x, BlinkWorkItem);
        BlinkHandler(pLed);
 }
-#endif
 
 /*  */
 /*     Description: */
@@ -75,12 +71,10 @@ void ResetLedStatus(PLED_871x pLed) {
        pLed->BlinkTimes = 0; /*  Number of times to toggle led state for blinking. */
        pLed->BlinkingLedState = LED_UNKNOWN; /*  Next state for blinking, either RTW_LED_ON or RTW_LED_OFF are. */
 
-#if defined(CONFIG_USB_HCI)
        pLed->bLedNoLinkBlinkInProgress = _FALSE;
        pLed->bLedLinkBlinkInProgress = _FALSE;
        pLed->bLedStartToLinkBlinkInProgress = _FALSE;
        pLed->bLedScanBlinkInProgress = _FALSE;
-#endif
 }
 
  /*  */
@@ -101,9 +95,7 @@ InitLed871x(
 
        _init_timer(&(pLed->BlinkTimer), padapter->pnetdev, BlinkTimerCallback, pLed);
 
-#if defined(CONFIG_USB_HCI)
-       _init_workitem(&(pLed->BlinkWorkItem), BlinkWorkItemCallback, pLed);
-#endif
+       INIT_WORK(&(pLed->BlinkWorkItem), BlinkWorkItemCallback);
 }
 
 /*  */
@@ -115,9 +107,7 @@ DeInitLed871x(
        PLED_871x                       pLed
        )
 {
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
-       _cancel_workitem_sync(&(pLed->BlinkWorkItem));
-#endif
+       cancel_work_sync(&(pLed->BlinkWorkItem));
        _cancel_timer_ex(&(pLed->BlinkTimer));
        ResetLedStatus(pLed);
 }
@@ -127,7 +117,6 @@ DeInitLed871x(
 /*             Implementation of LED blinking behavior. */
 /*             It toggle off LED and schedule corresponding timer if necessary. */
 /*  */
-#if defined(CONFIG_USB_HCI) || defined(CONFIG_GSPI_HCI)
 
 void SwLedOn(_adapter *padapter, PLED_871x pLed);
 void SwLedOff(_adapter *padapter, PLED_871x    pLed);
@@ -2384,5 +2373,3 @@ LedControl871x(
 
        RT_TRACE(_module_rtl8712_led_c_,_drv_info_,("LedStrategy:%d, LedAction %d\n", ledpriv->LedStrategy,LedAction));
 }
-
-#endif