diff options
| author | Mike McCormack <mikem@ring3k.org> | 2011-03-03 22:41:25 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-07 13:31:41 -0800 |
| commit | 477dfe7069ba8458f7ffe25c5ffcb91e70407bba (patch) | |
| tree | c6f4fce23aaff8582f3dbf69e807f33b5fc5603a /drivers/staging/rtl8192e | |
| parent | 0d65112ac0f083c77514c9e83958860d542b1d1a (diff) | |
| download | linux-stable-477dfe7069ba8458f7ffe25c5ffcb91e70407bba.tar.gz linux-stable-477dfe7069ba8458f7ffe25c5ffcb91e70407bba.tar.bz2 linux-stable-477dfe7069ba8458f7ffe25c5ffcb91e70407bba.zip | |
staging: rtl8192e: Remove pointless hw_sleep_wq
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e')
| -rw-r--r-- | drivers/staging/rtl8192e/ieee80211/ieee80211.h | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/r8192E_core.c | 14 |
2 files changed, 1 insertions, 14 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211.h b/drivers/staging/rtl8192e/ieee80211/ieee80211.h index 9a5f788d97ce..8501c4aced6f 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211.h +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211.h @@ -2268,7 +2268,6 @@ struct ieee80211_device { struct delayed_work associate_retry_wq; struct delayed_work start_ibss_wq; struct delayed_work hw_wakeup_wq; - struct delayed_work hw_sleep_wq; struct work_struct wx_sync_scan_wq; struct workqueue_struct *wq; diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index cc20e5d7f5af..2897ac251737 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -1852,15 +1852,6 @@ static void rtl8192_hw_sleep_down(struct net_device *dev) MgntActSet_RF_State(dev, eRfSleep, RF_CHANGE_BY_PS); } -static void rtl8192_hw_sleep_wq (struct work_struct *work) -{ - struct delayed_work *dwork = container_of(work,struct delayed_work,work); - struct ieee80211_device *ieee = container_of(dwork,struct ieee80211_device,hw_sleep_wq); - struct net_device *dev = ieee->dev; - - rtl8192_hw_sleep_down(dev); -} - static void rtl8192_hw_wakeup(struct net_device* dev) { MgntActSet_RF_State(dev, eRfOn, RF_CHANGE_BY_PS); @@ -1909,8 +1900,7 @@ static void rtl8192_hw_to_sleep(struct net_device *dev, u32 th, u32 tl) queue_delayed_work(priv->ieee80211->wq, &priv->ieee80211->hw_wakeup_wq,tmp); - queue_delayed_work(priv->ieee80211->wq, - (void *)&priv->ieee80211->hw_sleep_wq,0); + rtl8192_hw_sleep_down(dev); } static void rtl8192_init_priv_variable(struct net_device* dev) @@ -2063,7 +2053,6 @@ static void rtl8192_init_priv_task(struct net_device* dev) INIT_DELAYED_WORK(&priv->update_beacon_wq, rtl8192_update_beacon); INIT_WORK(&priv->qos_activate, rtl8192_qos_activate); INIT_DELAYED_WORK(&priv->ieee80211->hw_wakeup_wq, rtl8192_hw_wakeup_wq); - INIT_DELAYED_WORK(&priv->ieee80211->hw_sleep_wq, rtl8192_hw_sleep_wq); tasklet_init(&priv->irq_rx_tasklet, rtl8192_irq_rx_tasklet, (unsigned long) priv); @@ -4802,7 +4791,6 @@ static void rtl8192_cancel_deferred_work(struct r8192_priv* priv) cancel_delayed_work(&priv->watch_dog_wq); cancel_delayed_work(&priv->update_beacon_wq); cancel_delayed_work(&priv->ieee80211->hw_wakeup_wq); - cancel_delayed_work(&priv->ieee80211->hw_sleep_wq); cancel_delayed_work(&priv->gpio_change_rf_wq); cancel_work_sync(&priv->reset_wq); cancel_work_sync(&priv->qos_activate); |