scsi: mpt3sas: Simplify the workqueue allocation code

Let alloc_ordered_workqueue() format the workqueue name instead of
calling scnprintf() explicitly. Compile-tested only.

Cc: Ranjan Kumar <ranjan.kumar@broadcom.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://patch.msgid.link/20260106185655.2526800-1-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index e4e22cb0e277b46490994637e36a018172b850ed..2f2183f405c956e996d41f430ed9b12aae516fff 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -843,11 +843,8 @@ mpt3sas_base_start_watchdog(struct MPT3SAS_ADAPTER *ioc)
        /* initialize fault polling */
 
        INIT_DELAYED_WORK(&ioc->fault_reset_work, _base_fault_reset_work);
-       scnprintf(ioc->fault_reset_work_q_name,
-           sizeof(ioc->fault_reset_work_q_name), "poll_%s%d_status",
-           ioc->driver_name, ioc->id);
        ioc->fault_reset_work_q = alloc_ordered_workqueue(
-               "%s", WQ_MEM_RECLAIM, ioc->fault_reset_work_q_name);
+               "poll_%s%d_status", WQ_MEM_RECLAIM, ioc->driver_name, ioc->id);
        if (!ioc->fault_reset_work_q) {
                ioc_err(ioc, "%s: failed (line=%d)\n", __func__, __LINE__);
                return;

diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h
index de37fa5ac0736bdd77b8a354b33a951d7d76c106..d4597d058705d250ee6f9d337dbef8c19f9ddc02 100644 (file)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@ -1163,9 +1163,8 @@ typedef void (*MPT3SAS_FLUSH_RUNNING_CMDS)(struct MPT3SAS_ADAPTER *ioc);
  * @mask_interrupts: ignore interrupt
  * @pci_access_mutex: Mutex to synchronize ioctl, sysfs show path and
  *                     pci resource handling
- * @fault_reset_work_q_name: fw fault work queue
- * @fault_reset_work_q: ""
- * @fault_reset_work: ""
+ * @fault_reset_work_q: fw fault workqueue
+ * @fault_reset_work: fw fault work
  * @firmware_event_thread: fw event work queue
  * @fw_event_lock:
  * @fw_event_list: list of fw events
@@ -1349,7 +1348,6 @@ struct MPT3SAS_ADAPTER {
        u8              mask_interrupts;
 
        /* fw fault handler */
-       char            fault_reset_work_q_name[20];
        struct workqueue_struct *fault_reset_work_q;
        struct delayed_work fault_reset_work;