[PATCH 15/53] sfc: Switch to create*_workqueue2()

Bart Van Assche posted 53 patches 1 year, 5 months ago
Only 52 patches received!
[PATCH 15/53] sfc: Switch to create*_workqueue2()
Posted by Bart Van Assche 1 year, 5 months ago
Prepare for removal of the create*_workqueue() macros.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 drivers/net/ethernet/sfc/efx_common.c       | 3 ++-
 drivers/net/ethernet/sfc/falcon/efx.c       | 3 ++-
 drivers/net/ethernet/sfc/siena/efx_common.c | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/sfc/efx_common.c b/drivers/net/ethernet/sfc/efx_common.c
index 4ebd5ae23eca..6dc068d2c295 100644
--- a/drivers/net/ethernet/sfc/efx_common.c
+++ b/drivers/net/ethernet/sfc/efx_common.c
@@ -1035,7 +1035,8 @@ int efx_init_struct(struct efx_nic *efx, struct pci_dev *pci_dev)
 	/* Would be good to use the net_dev name, but we're too early */
 	snprintf(efx->workqueue_name, sizeof(efx->workqueue_name), "sfc%s",
 		 pci_name(pci_dev));
-	efx->workqueue = create_singlethread_workqueue(efx->workqueue_name);
+	efx->workqueue =
+		create_singlethread_workqueue2("%s", efx->workqueue_name);
 	if (!efx->workqueue) {
 		rc = -ENOMEM;
 		goto fail;
diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c
index 8925745f1c17..d4d02e2438c6 100644
--- a/drivers/net/ethernet/sfc/falcon/efx.c
+++ b/drivers/net/ethernet/sfc/falcon/efx.c
@@ -2671,7 +2671,8 @@ static int ef4_init_struct(struct ef4_nic *efx,
 	/* Would be good to use the net_dev name, but we're too early */
 	snprintf(efx->workqueue_name, sizeof(efx->workqueue_name), "sfc%s",
 		 pci_name(pci_dev));
-	efx->workqueue = create_singlethread_workqueue(efx->workqueue_name);
+	efx->workqueue =
+		create_singlethread_workqueue2("%s", efx->workqueue_name);
 	if (!efx->workqueue)
 		goto fail;
 
diff --git a/drivers/net/ethernet/sfc/siena/efx_common.c b/drivers/net/ethernet/sfc/siena/efx_common.c
index cf195162e270..1a1448a75d99 100644
--- a/drivers/net/ethernet/sfc/siena/efx_common.c
+++ b/drivers/net/ethernet/sfc/siena/efx_common.c
@@ -1050,7 +1050,8 @@ int efx_siena_init_struct(struct efx_nic *efx,
 	/* Would be good to use the net_dev name, but we're too early */
 	snprintf(efx->workqueue_name, sizeof(efx->workqueue_name), "sfc%s",
 		 pci_name(pci_dev));
-	efx->workqueue = create_singlethread_workqueue(efx->workqueue_name);
+	efx->workqueue =
+		create_singlethread_workqueue2("%s", efx->workqueue_name);
 	if (!efx->workqueue) {
 		rc = -ENOMEM;
 		goto fail;