scsi: esas2r: Simplify an alloc_ordered_workqueue() invocation

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

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240822195944.654691-6-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/esas2r/esas2r.h b/drivers/scsi/esas2r/esas2r.h
index ed63f7a9ea54f0e72acb838fe1278774965672be..8a133254c4f6575b778be958471c20f6fcf4bf2f 100644 (file)
--- a/drivers/scsi/esas2r/esas2r.h
+++ b/drivers/scsi/esas2r/esas2r.h
@@ -929,7 +929,6 @@ struct esas2r_adapter {
        struct list_head fw_event_list;
        spinlock_t fw_event_lock;
        u8 fw_events_off;                       /* if '1', then ignore events */
-       char fw_event_q_name[ESAS2R_KOBJ_NAME_LEN];
        /*
         * intr_mode stores the interrupt mode currently being used by this
         * adapter. it is based on the interrupt_mode module parameter, but

diff --git a/drivers/scsi/esas2r/esas2r_init.c b/drivers/scsi/esas2r/esas2r_init.c
index ff1fa3160c617f0c4310574ce864eacac324ce66..0cea5f3d1a08e03ff8f49c780bb8edfc259a9f22 100644 (file)
--- a/drivers/scsi/esas2r/esas2r_init.c
+++ b/drivers/scsi/esas2r/esas2r_init.c
@@ -311,10 +311,8 @@ int esas2r_init_adapter(struct Scsi_Host *host, struct pci_dev *pcid,
        sema_init(&a->nvram_semaphore, 1);
 
        esas2r_fw_event_off(a);
-       snprintf(a->fw_event_q_name, ESAS2R_KOBJ_NAME_LEN, "esas2r/%d",
-                a->index);
-       a->fw_event_q = alloc_ordered_workqueue("%s", WQ_MEM_RECLAIM,
-                                               a->fw_event_q_name);
+       a->fw_event_q =
+               alloc_ordered_workqueue("esas2r/%d", WQ_MEM_RECLAIM, a->index);
 
        init_waitqueue_head(&a->buffered_ioctl_waiter);
        init_waitqueue_head(&a->nvram_waiter);