OSDN Git Service

staging: rtl8188eu: Replace _cancel_workitem_sync() with cancel_work_sync()
authornavin patidar <navin.patidar@gmail.com>
Sun, 22 Jun 2014 08:36:30 +0000 (14:06 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2014 00:27:13 +0000 (20:27 -0400)
Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/core/rtw_cmd.c
drivers/staging/rtl8188eu/core/rtw_led.c
drivers/staging/rtl8188eu/include/osdep_service.h

index 8d36e2c..a292c5d 100644 (file)
@@ -96,7 +96,7 @@ void rtw_free_evt_priv(struct evt_priv *pevtpriv)
 
        RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+rtw_free_evt_priv\n"));
 
-       _cancel_workitem_sync(&pevtpriv->c2h_wk);
+       cancel_work_sync(&pevtpriv->c2h_wk);
        while (pevtpriv->c2h_wk_alive)
                msleep(10);
 
index 87d6f06..a266f34 100644 (file)
@@ -88,7 +88,7 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed)
 /*  */
 void DeInitLed871x(struct LED_871x *pLed)
 {
-       _cancel_workitem_sync(&(pLed->BlinkWorkItem));
+       cancel_work_sync(&(pLed->BlinkWorkItem));
        _cancel_timer_ex(&(pLed->BlinkTimer));
        ResetLedStatus(pLed);
 }
index a55b786..bc1ffd4 100644 (file)
@@ -101,11 +101,6 @@ static inline void _cancel_timer(struct timer_list *ptimer, u8 *bcancelled)
 #define RTW_DECLARE_TIMER_HDL(name) \
        void RTW_TIMER_HDL_NAME(name)(RTW_TIMER_HDL_ARGS)
 
-static inline void _cancel_workitem_sync(struct work_struct *pwork)
-{
-       cancel_work_sync(pwork);
-}
-
 static inline int rtw_netif_queue_stopped(struct net_device *pnetdev)
 {
        return  netif_tx_queue_stopped(netdev_get_tx_queue(pnetdev, 0)) &&