Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 292b9dab authored by Bhaktipriya Shridhar's avatar Bhaktipriya Shridhar Committed by David S. Miller
Browse files

net: cavium: liquidio: Remove deprecated create_workqueue 



alloc_workqueue replaces deprecated create_workqueue().

A dedicated workqueue has been used since the workitem viz
(&lio->txq_status_wq.wk.work which maps to octnet_poll_check_txq_status)
is involved in a brief poll routine for checking transmit queue status
and is an intergral part of 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: default avatarBhaktipriya Shridhar <bhaktipriya96@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f7d3c1cb

drivers/net/ethernet/cavium/liquidio/lio_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2036,7 +2036,8 @@ static inline void setup_tx_poll_fn(struct net_device *netdev) 
	struct lio *lio = GET_LIO(netdev);

	struct octeon_device *oct = lio->oct_dev;



	lio->txq_status_wq.wq = create_workqueue("txq-status");

	lio->txq_status_wq.wq = alloc_workqueue("txq-status",

						WQ_MEM_RECLAIM, 0);

	if (!lio->txq_status_wq.wq) {

		dev_err(&oct->pci_dev->dev, "unable to create cavium txq status wq\n");

		return;
@@ -2103,7 +2104,6 @@ static int liquidio_stop(struct net_device *netdev) 
	send_rx_ctrl_cmd(lio, 0);



	cancel_delayed_work_sync(&lio->txq_status_wq.wk.work);

	flush_workqueue(lio->txq_status_wq.wq);

	destroy_workqueue(lio->txq_status_wq.wq);



	if (lio->ptp_clock) {