scsi: fcoe: Simplify alloc_ordered_workqueue() invocations

Let alloc_ordered_workqueue() format the workqueue name instead of calling
snprintf() explicitly.

Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240822195944.654691-7-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
index 06357bbf6b2c0759650d1f0792e9b949d5e95e9b..0609ca6b935300a45268e9d4b8697c541ec14a5d 100644 (file)
--- a/drivers/scsi/fcoe/fcoe_sysfs.c
+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
@@ -45,12 +45,8 @@ MODULE_PARM_DESC(fcf_dev_loss_tmo,
  */
 #define fcoe_ctlr_id(x)                                \
        ((x)->id)
-#define fcoe_ctlr_work_q_name(x)               \
-       ((x)->work_q_name)
 #define fcoe_ctlr_work_q(x)                    \
        ((x)->work_q)
-#define fcoe_ctlr_devloss_work_q_name(x)       \
-       ((x)->devloss_work_q_name)
 #define fcoe_ctlr_devloss_work_q(x)            \
        ((x)->devloss_work_q)
 #define fcoe_ctlr_mode(x)                      \
@@ -797,18 +793,14 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
 
        ctlr->fcf_dev_loss_tmo = fcoe_fcf_dev_loss_tmo;
 
-       snprintf(ctlr->work_q_name, sizeof(ctlr->work_q_name),
-                "ctlr_wq_%d", ctlr->id);
-       ctlr->work_q = alloc_ordered_workqueue("%s", WQ_MEM_RECLAIM,
-                                              ctlr->work_q_name);
+       ctlr->work_q = alloc_ordered_workqueue("ctlr_wq_%d", WQ_MEM_RECLAIM,
+                                              ctlr->id);
        if (!ctlr->work_q)
                goto out_del;
 
-       snprintf(ctlr->devloss_work_q_name,
-                sizeof(ctlr->devloss_work_q_name),
-                "ctlr_dl_wq_%d", ctlr->id);
-       ctlr->devloss_work_q = alloc_ordered_workqueue(
-               "%s", WQ_MEM_RECLAIM, ctlr->devloss_work_q_name);
+       ctlr->devloss_work_q = alloc_ordered_workqueue("ctlr_dl_wq_%d",
+                                                      WQ_MEM_RECLAIM,
+                                                      ctlr->id);
        if (!ctlr->devloss_work_q)
                goto out_del_q;
 

diff --git a/include/scsi/fcoe_sysfs.h b/include/scsi/fcoe_sysfs.h
index 4b1216de3f22f6ec7ec87a7342c56e307d30f42a..2b28a05e492b06bb6743e062d21de70dbd6d286e 100644 (file)
--- a/include/scsi/fcoe_sysfs.h
+++ b/include/scsi/fcoe_sysfs.h
@@ -50,9 +50,7 @@ struct fcoe_ctlr_device {
        struct fcoe_sysfs_function_template *f;
 
        struct list_head                fcfs;
-       char                            work_q_name[20];
        struct workqueue_struct         *work_q;
-       char                            devloss_work_q_name[20];
        struct workqueue_struct         *devloss_work_q;
        struct mutex                    lock;