scsi: mptfusion: Simplify the alloc*_workqueue() invocations

Let alloc*_workqueue() format the workqueue names instead of calling
snprintf() explicitly.

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

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 4bf669c5564932616a69056598765969a138c08e..738bc4e60a18b0aed3524104fd72e6e40d24aad9 100644 (file)
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1856,10 +1856,8 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
        /* Initialize workqueue */
        INIT_DELAYED_WORK(&ioc->fault_reset_work, mpt_fault_reset_work);
 
-       snprintf(ioc->reset_work_q_name, MPT_KOBJ_NAME_LEN,
-                "mpt_poll_%d", ioc->id);
-       ioc->reset_work_q = alloc_workqueue(ioc->reset_work_q_name,
-                                           WQ_MEM_RECLAIM, 0);
+       ioc->reset_work_q =
+               alloc_workqueue("mpt_poll_%d", WQ_MEM_RECLAIM, 0, ioc->id);
        if (!ioc->reset_work_q) {
                printk(MYIOC_s_ERR_FMT "Insufficient memory to add adapter!\n",
                    ioc->name);
@@ -1986,9 +1984,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 
        INIT_LIST_HEAD(&ioc->fw_event_list);
        spin_lock_init(&ioc->fw_event_lock);
-       snprintf(ioc->fw_event_q_name, MPT_KOBJ_NAME_LEN, "mpt/%d", ioc->id);
-       ioc->fw_event_q = alloc_workqueue(ioc->fw_event_q_name,
-                                         WQ_MEM_RECLAIM, 0);
+       ioc->fw_event_q = alloc_workqueue("mpt/%d", WQ_MEM_RECLAIM, 0, ioc->id);
        if (!ioc->fw_event_q) {
                printk(MYIOC_s_ERR_FMT "Insufficient memory to add adapter!\n",
                    ioc->name);

diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 8031173c3655d5731f8d7bc315dc5bb4312bb314..b406fd676da09777feda8f7ac236e31d093d2dba 100644 (file)
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -729,7 +729,6 @@ typedef struct _MPT_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[MPT_KOBJ_NAME_LEN];
 
        struct mutex             sas_discovery_mutex;
        u8                       sas_discovery_runtime;
@@ -764,7 +763,6 @@ typedef struct _MPT_ADAPTER
        u8                       fc_link_speed[2];
        spinlock_t               fc_rescan_work_lock;
        struct work_struct       fc_rescan_work;
-       char                     fc_rescan_work_q_name[MPT_KOBJ_NAME_LEN];
        struct workqueue_struct *fc_rescan_work_q;
 
        /* driver forced bus resets count */
@@ -778,7 +776,6 @@ typedef struct _MPT_ADAPTER
        spinlock_t                scsi_lookup_lock;
        u64                     dma_mask;
        u32                       broadcast_aen_busy;
-       char                     reset_work_q_name[MPT_KOBJ_NAME_LEN];
        struct workqueue_struct *reset_work_q;
        struct delayed_work      fault_reset_work;
 

diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index a3c17c4fe69c547ecc0df09380303dbc92a22397..91242f26defb008e0451cbc07074fc386565dfab 100644 (file)
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -1349,11 +1349,8 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        /* initialize workqueue */
 
-       snprintf(ioc->fc_rescan_work_q_name, sizeof(ioc->fc_rescan_work_q_name),
-                "mptfc_wq_%d", sh->host_no);
-       ioc->fc_rescan_work_q =
-               alloc_ordered_workqueue(ioc->fc_rescan_work_q_name,
-                                       WQ_MEM_RECLAIM);
+       ioc->fc_rescan_work_q = alloc_ordered_workqueue(
+               "mptfc_wq_%d", WQ_MEM_RECLAIM, sh->host_no);
        if (!ioc->fc_rescan_work_q) {
                error = -ENOMEM;
                goto out_mptfc_host;