diff options
| author | Bart Van Assche <bvanassche@acm.org> | 2026-01-06 21:56:54 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2026-01-12 06:03:12 +0300 |
| commit | bf286f5558bfade5b746646b8b94685648f4b49a (patch) | |
| tree | f51c481daf0e2d0ae2386c1dfad22857592eec5c | |
| parent | 8d0aecdebc0f3c123221e67d2f64ff0982f76cb3 (diff) | |
| download | linux-bf286f5558bfade5b746646b8b94685648f4b49a.tar.xz | |
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>
| -rw-r--r-- | drivers/scsi/mpt3sas/mpt3sas_base.c | 5 | ||||
| -rw-r--r-- | drivers/scsi/mpt3sas/mpt3sas_base.h | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c index e4e22cb0e277..2f2183f405c9 100644 --- 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 de37fa5ac073..d4597d058705 100644 --- 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; |