Skip to content

Commit

Permalink
net: ethernet: cavium: liquidio: request_manager: Remove create_workq…
Browse files Browse the repository at this point in the history
…ueue

alloc_workqueue replaces deprecated create_workqueue().

A dedicated workqueue has been used since the workitem viz
(&db_wq->wk.work which maps to check_db_timeout) is involved
in normal device operation. WQ_MEM_RECLAIM has been set to guarantee
forward progress under memory pressure, which is a requirement here.
Since there are only a fixed number of work items, explicit concurrency
limit is unnecessary.

flush_workqueue is unnecessary since destroy_workqueue() itself calls
drain_workqueue() which flushes repeatedly till the workqueue
becomes empty.

Signed-off-by: Bhaktipriya Shridhar <bhaktipriya96@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Bhaktipriya Shridhar authored and David S. Miller committed Jun 7, 2016
1 parent 523a61b commit aaa7672
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/net/ethernet/cavium/liquidio/request_manager.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@ int octeon_init_instr_queue(struct octeon_device *oct,

oct->fn_list.setup_iq_regs(oct, iq_no);

oct->check_db_wq[iq_no].wq = create_workqueue("check_iq_db");
oct->check_db_wq[iq_no].wq = alloc_workqueue("check_iq_db",
WQ_MEM_RECLAIM,
0);
if (!oct->check_db_wq[iq_no].wq) {
lio_dma_free(oct, q_size, iq->base_addr, iq->base_addr_dma);
dev_err(&oct->pci_dev->dev, "check db wq create failed for iq %d\n",
Expand All @@ -168,7 +170,6 @@ int octeon_delete_instr_queue(struct octeon_device *oct, u32 iq_no)
struct octeon_instr_queue *iq = oct->instr_queue[iq_no];

cancel_delayed_work_sync(&oct->check_db_wq[iq_no].wk.work);
flush_workqueue(oct->check_db_wq[iq_no].wq);
destroy_workqueue(oct->check_db_wq[iq_no].wq);

if (OCTEON_CN6XXX(oct))
Expand Down

0 comments on commit aaa7672

Please sign in to comment.