diff options
author | Bhaktipriya Shridhar <bhaktipriya96@gmail.com> | 2016-07-25 09:10:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-07-26 00:39:36 -0400 |
commit | deb1f45a2f8479ffa5a791e2c024a640a08f729e (patch) | |
tree | ce9d5d991535389818a66bd3261d3b21c9dc5918 /drivers/net/caif | |
parent | eefc06bd0272264f38f84b10879d3bdb5b5d1ee3 (diff) |
caif-hsi: Remove deprecated create_singlethread_workqueue
alloc_workqueue replaces deprecated create_singlethread_workqueue().
A dedicated workqueue has been used since the workitems are being used
on a packet tx/rx path. Hence, WQ_MEM_RECLAIM has been set to guarantee
forward progress under memory pressure.
An ordered workqueue has been used since workitems &cfhsi->wake_up_work
and &cfhsi->wake_down_work cannot be run concurrently.
Calls to flush_workqueue() before destroy_workqueue() have been dropped
since destroy_workqueue() itself calls drain_workqueue() which flushes
repeatedly till the workqueue becomes empty.
Signed-off-by: Bhaktipriya Shridhar <bhaktipriya96@gmail.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/caif')
-rw-r--r-- | drivers/net/caif/caif_hsi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c index 615c65da39be..ddabce759456 100644 --- a/drivers/net/caif/caif_hsi.c +++ b/drivers/net/caif/caif_hsi.c | |||
@@ -1201,7 +1201,7 @@ static int cfhsi_open(struct net_device *ndev) | |||
1201 | clear_bit(CFHSI_AWAKE, &cfhsi->bits); | 1201 | clear_bit(CFHSI_AWAKE, &cfhsi->bits); |
1202 | 1202 | ||
1203 | /* Create work thread. */ | 1203 | /* Create work thread. */ |
1204 | cfhsi->wq = create_singlethread_workqueue(cfhsi->ndev->name); | 1204 | cfhsi->wq = alloc_ordered_workqueue(cfhsi->ndev->name, WQ_MEM_RECLAIM); |
1205 | if (!cfhsi->wq) { | 1205 | if (!cfhsi->wq) { |
1206 | netdev_err(cfhsi->ndev, "%s: Failed to create work queue.\n", | 1206 | netdev_err(cfhsi->ndev, "%s: Failed to create work queue.\n", |
1207 | __func__); | 1207 | __func__); |
@@ -1267,9 +1267,6 @@ static int cfhsi_close(struct net_device *ndev) | |||
1267 | /* going to shutdown driver */ | 1267 | /* going to shutdown driver */ |
1268 | set_bit(CFHSI_SHUTDOWN, &cfhsi->bits); | 1268 | set_bit(CFHSI_SHUTDOWN, &cfhsi->bits); |
1269 | 1269 | ||
1270 | /* Flush workqueue */ | ||
1271 | flush_workqueue(cfhsi->wq); | ||
1272 | |||
1273 | /* Delete timers if pending */ | 1270 | /* Delete timers if pending */ |
1274 | del_timer_sync(&cfhsi->inactivity_timer); | 1271 | del_timer_sync(&cfhsi->inactivity_timer); |
1275 | del_timer_sync(&cfhsi->rx_slowpath_timer); | 1272 | del_timer_sync(&cfhsi->rx_slowpath_timer); |