lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8192e: Remove pointless hw_sleep_wq

Browse Source 
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mike McCormack
2011-03-03 22:41:25 +09:00
committed by Greg Kroah-Hartman
parent 0d65112ac0
commit 477dfe7069
2 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/rtl8192e/ieee80211/ieee80211.h
View File

@@ -2268,7 +2268,6 @@ struct ieee80211_device {
struct delayed_work associate_retry_wq; struct delayed_work associate_retry_wq;
struct delayed_work start_ibss_wq; struct delayed_work start_ibss_wq;
struct delayed_work hw_wakeup_wq; struct delayed_work hw_wakeup_wq;
struct delayed_work hw_sleep_wq;
struct work_struct wx_sync_scan_wq; struct work_struct wx_sync_scan_wq;
struct workqueue_struct *wq; struct workqueue_struct *wq;

14
drivers/staging/rtl8192e/r8192E_core.c
View File

@@ -1852,15 +1852,6 @@ static void rtl8192_hw_sleep_down(struct net_device *dev)
MgntActSet_RF_State(dev, eRfSleep, RF_CHANGE_BY_PS); 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) static void rtl8192_hw_wakeup(struct net_device* dev)
{ {
MgntActSet_RF_State(dev, eRfOn, RF_CHANGE_BY_PS); 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, queue_delayed_work(priv->ieee80211->wq,
&priv->ieee80211->hw_wakeup_wq,tmp); &priv->ieee80211->hw_wakeup_wq,tmp);
queue_delayed_work(priv->ieee80211->wq, rtl8192_hw_sleep_down(dev);
(void *)&priv->ieee80211->hw_sleep_wq,0);
} }
static void rtl8192_init_priv_variable(struct net_device* 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_DELAYED_WORK(&priv->update_beacon_wq, rtl8192_update_beacon);
INIT_WORK(&priv->qos_activate, rtl8192_qos_activate); 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_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, tasklet_init(&priv->irq_rx_tasklet, rtl8192_irq_rx_tasklet,
(unsigned long) priv); (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->watch_dog_wq);
cancel_delayed_work(&priv->update_beacon_wq); cancel_delayed_work(&priv->update_beacon_wq);
cancel_delayed_work(&priv->ieee80211->hw_wakeup_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_delayed_work(&priv->gpio_change_rf_wq);
cancel_work_sync(&priv->reset_wq); cancel_work_sync(&priv->reset_wq);
cancel_work_sync(&priv->qos_activate); cancel_work_sync(&priv->qos_activate);