scsi: mpt3sas: Simplify the workqueue allocation code
Subsystems (2)
PATCH 1/1 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 <[email protected]>
Signed-off-by Bart Van Assche <[email protected]>
--- drivers/scsi/mpt3sas/mpt3sas_base.c | 5 +---- drivers/scsi/mpt3sas/mpt3sas_base.h | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-)
drivers/scsi/mpt3sas/mpt3sas_base.c +1 -4
@@ -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 ;
drivers/scsi/mpt3sas/mpt3sas_base.h +2 -4
@@ -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;
Martin K. Petersen
AppliedBart,
Quoted 2 lines
Let
alloc_ordered_workqueue()format the workqueue name instead of callingscnprintf()explicitly. Compile-tested only.
Applied to 6.20/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen
Martin K. Petersen
AppliedQuoted 4 lines · Bart Van Assche
Let
alloc_ordered_workqueue()format the workqueue name instead of callingscnprintf()explicitly. Compile-tested only.
Applied to 6.20/scsi-queue, thanks!
[1/1] scsi: mpt3sas: Simplify the workqueue allocation code
https://git.kernel.org/mkp/scsi/c/bf286f5558bf
Signature · 1 line
Martin K. Petersen