Skip to content

Commit deb1f45

Browse files
bhaktipriyadavem330
authored andcommitted
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>
1 parent eefc06b commit deb1f45

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

drivers/net/caif/caif_hsi.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ static int cfhsi_open(struct net_device *ndev)
12011201
clear_bit(CFHSI_AWAKE, &cfhsi->bits);
12021202

12031203
/* Create work thread. */
1204-
cfhsi->wq = create_singlethread_workqueue(cfhsi->ndev->name);
1204+
cfhsi->wq = alloc_ordered_workqueue(cfhsi->ndev->name, WQ_MEM_RECLAIM);
12051205
if (!cfhsi->wq) {
12061206
netdev_err(cfhsi->ndev, "%s: Failed to create work queue.\n",
12071207
__func__);
@@ -1267,9 +1267,6 @@ static int cfhsi_close(struct net_device *ndev)
12671267
/* going to shutdown driver */
12681268
set_bit(CFHSI_SHUTDOWN, &cfhsi->bits);
12691269

1270-
/* Flush workqueue */
1271-
flush_workqueue(cfhsi->wq);
1272-
12731270
/* Delete timers if pending */
12741271
del_timer_sync(&cfhsi->inactivity_timer);
12751272
del_timer_sync(&cfhsi->rx_slowpath_timer);

0 commit comments

Comments
 (0)