Skip to content

Commit b3b359a

Browse files
bvanasschemartinkpetersen
authored andcommitted
scsi: mpt3sas: 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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 1bd2896 commit b3b359a

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

drivers/scsi/mpt3sas/mpt3sas_base.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,8 +1162,7 @@ typedef void (*MPT3SAS_FLUSH_RUNNING_CMDS)(struct MPT3SAS_ADAPTER *ioc);
11621162
* @fault_reset_work_q_name: fw fault work queue
11631163
* @fault_reset_work_q: ""
11641164
* @fault_reset_work: ""
1165-
* @firmware_event_name: fw event work queue
1166-
* @firmware_event_thread: ""
1165+
* @firmware_event_thread: fw event work queue
11671166
* @fw_event_lock:
11681167
* @fw_event_list: list of fw events
11691168
* @current_evet: current processing firmware event
@@ -1351,7 +1350,6 @@ struct MPT3SAS_ADAPTER {
13511350
struct delayed_work fault_reset_work;
13521351

13531352
/* fw event handler */
1354-
char firmware_event_name[20];
13551353
struct workqueue_struct *firmware_event_thread;
13561354
spinlock_t fw_event_lock;
13571355
struct list_head fw_event_list;

drivers/scsi/mpt3sas/mpt3sas_scsih.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12301,10 +12301,8 @@ _scsih_probe(struct pci_dev *pdev, const struct pci_device_id *id)
1230112301
scsi_host_set_guard(shost, SHOST_DIX_GUARD_CRC);
1230212302

1230312303
/* event thread */
12304-
snprintf(ioc->firmware_event_name, sizeof(ioc->firmware_event_name),
12305-
"fw_event_%s%d", ioc->driver_name, ioc->id);
1230612304
ioc->firmware_event_thread = alloc_ordered_workqueue(
12307-
ioc->firmware_event_name, 0);
12305+
"fw_event_%s%d", 0, ioc->driver_name, ioc->id);
1230812306
if (!ioc->firmware_event_thread) {
1230912307
ioc_err(ioc, "failure at %s:%d/%s()!\n",
1231012308
__FILE__, __LINE__, __func__);

0 commit comments

Comments
 (0)