staging: rtl8192u: use to_delayed_work
authorGeliang Tang <geliangtang@163.com>
Mon, 28 Dec 2015 15:43:38 +0000 (23:43 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Feb 2016 03:56:45 +0000 (19:56 -0800)
Use to_delayed_work() instead of open-coding it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
drivers/staging/rtl8192u/r8192U_core.c
drivers/staging/rtl8192u/r8192U_dm.c
drivers/staging/rtl8192u/r819xU_phy.c

index 38c3eb78094e6b0113d68c7e7994781493a1b909..21ee41034d7aef5c0f743d924ae56f5e1b39591d 100644 (file)
@@ -487,7 +487,7 @@ EXPORT_SYMBOL(ieee80211_softmac_scan_syncro);
 
 static void ieee80211_softmac_scan_wq(struct work_struct *work)
 {
-       struct delayed_work *dwork = container_of(work, struct delayed_work, work);
+       struct delayed_work *dwork = to_delayed_work(work);
        struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, softmac_scan_wq);
        static short watchdog;
        u8 channel_map[MAX_CHANNEL_NUMBER+1];
@@ -2330,7 +2330,7 @@ static void ieee80211_start_monitor_mode(struct ieee80211_device *ieee)
 static void ieee80211_start_ibss_wq(struct work_struct *work)
 {
 
-       struct delayed_work *dwork = container_of(work, struct delayed_work, work);
+       struct delayed_work *dwork = to_delayed_work(work);
        struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, start_ibss_wq);
        /* iwconfig mode ad-hoc will schedule this and return
         * on the other hand this will block further iwconfig SET
@@ -2504,7 +2504,7 @@ EXPORT_SYMBOL(ieee80211_disassociate);
 
 static void ieee80211_associate_retry_wq(struct work_struct *work)
 {
-       struct delayed_work *dwork = container_of(work, struct delayed_work, work);
+       struct delayed_work *dwork = to_delayed_work(work);
        struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, associate_retry_wq);
        unsigned long flags;
 
index f4a4eae72aa42562e1eb5761e6c6010130bf707d..5ac089335aca8d134df33ae983c4aad1645325c1 100644 (file)
@@ -3436,8 +3436,7 @@ static void rtl819x_update_rxcounts(struct r8192_priv *priv, u32 *TotalRxBcnNum,
 
 static void rtl819x_watchdog_wqcallback(struct work_struct *work)
 {
-       struct delayed_work *dwork = container_of(work,
-                                                 struct delayed_work, work);
+       struct delayed_work *dwork = to_delayed_work(work);
        struct r8192_priv *priv = container_of(dwork,
                                               struct r8192_priv, watch_dog_wq);
        struct net_device *dev = priv->ieee80211->dev;
index 375ec96b94695a18243a114c01bdf0d4dc18e23b..9b58b1afc1d1e371e30b9b67a8849b01c5f177ab 100644 (file)
@@ -767,7 +767,7 @@ static void dm_TXPowerTrackingCallback_ThermalMeter(struct net_device *dev)
 
 void dm_txpower_trackingcallback(struct work_struct *work)
 {
-       struct delayed_work *dwork = container_of(work, struct delayed_work, work);
+       struct delayed_work *dwork = to_delayed_work(work);
        struct r8192_priv *priv = container_of(dwork, struct r8192_priv, txpower_tracking_wq);
        struct net_device *dev = priv->ieee80211->dev;
 
@@ -2412,7 +2412,7 @@ static    void    dm_check_pbc_gpio(struct net_device *dev)
  *---------------------------------------------------------------------------*/
 void dm_rf_pathcheck_workitemcallback(struct work_struct *work)
 {
-       struct delayed_work *dwork = container_of(work, struct delayed_work, work);
+       struct delayed_work *dwork = to_delayed_work(work);
        struct r8192_priv *priv = container_of(dwork, struct r8192_priv, rfpath_check_wq);
        struct net_device *dev = priv->ieee80211->dev;
        /*bool bactually_set = false;*/
index f264d88364a11be7469803927e4c3cb20b86e71f..696df34400771dc9011b1f5b6561a2bab4a55f26 100644 (file)
@@ -1683,8 +1683,7 @@ void InitialGain819xUsb(struct net_device *dev,   u8 Operation)
 
 void InitialGainOperateWorkItemCallBack(struct work_struct *work)
 {
-       struct delayed_work *dwork = container_of(work, struct delayed_work,
-                                                 work);
+       struct delayed_work *dwork = to_delayed_work(work);
        struct r8192_priv *priv = container_of(dwork, struct r8192_priv,
                                               initialgain_operate_wq);
        struct net_device *dev = priv->ieee80211->dev;