scsi: ufs: Simplify alloc*_workqueue() invocation

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

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: Peter Wang <peter.wang@mediatek.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20240822195944.654691-18-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 930b15d9356bb01deda3dd79f560b717450743de..d89b2f14e764a91af1e42ec2e0e4f36f19923e63 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -1785,8 +1785,6 @@ static void ufshcd_remove_clk_scaling_sysfs(struct ufs_hba *hba)
 
 static void ufshcd_init_clk_scaling(struct ufs_hba *hba)
 {
-       char wq_name[sizeof("ufs_clkscaling_00")];
-
        if (!ufshcd_is_clkscaling_supported(hba))
                return;
 
@@ -1798,10 +1796,8 @@ static void ufshcd_init_clk_scaling(struct ufs_hba *hba)
        INIT_WORK(&hba->clk_scaling.resume_work,
                  ufshcd_clk_scaling_resume_work);
 
-       snprintf(wq_name, sizeof(wq_name), "ufs_clkscaling_%d",
-                hba->host->host_no);
-       hba->clk_scaling.workq =
-               alloc_ordered_workqueue("%s", WQ_MEM_RECLAIM, wq_name);
+       hba->clk_scaling.workq = alloc_ordered_workqueue(
+               "ufs_clkscaling_%d", WQ_MEM_RECLAIM, hba->host->host_no);
 
        hba->clk_scaling.is_initialized = true;
 }
@@ -2125,8 +2121,6 @@ static void ufshcd_remove_clk_gating_sysfs(struct ufs_hba *hba)
 
 static void ufshcd_init_clk_gating(struct ufs_hba *hba)
 {
-       char wq_name[sizeof("ufs_clk_gating_00")];
-
        if (!ufshcd_is_clkgating_allowed(hba))
                return;
 
@@ -2136,10 +2130,9 @@ static void ufshcd_init_clk_gating(struct ufs_hba *hba)
        INIT_DELAYED_WORK(&hba->clk_gating.gate_work, ufshcd_gate_work);
        INIT_WORK(&hba->clk_gating.ungate_work, ufshcd_ungate_work);
 
-       snprintf(wq_name, ARRAY_SIZE(wq_name), "ufs_clk_gating_%d",
-                hba->host->host_no);
-       hba->clk_gating.clk_gating_workq = alloc_ordered_workqueue(wq_name,
-                                       WQ_MEM_RECLAIM | WQ_HIGHPRI);
+       hba->clk_gating.clk_gating_workq = alloc_ordered_workqueue(
+               "ufs_clk_gating_%d", WQ_MEM_RECLAIM | WQ_HIGHPRI,
+               hba->host->host_no);
 
        ufshcd_init_clk_gating_sysfs(hba);
 
@@ -10376,7 +10369,6 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
        int err;
        struct Scsi_Host *host = hba->host;
        struct device *dev = hba->dev;
-       char eh_wq_name[sizeof("ufs_eh_wq_00")];
 
        /*
         * dev_set_drvdata() must be called before any callbacks are registered
@@ -10443,9 +10435,8 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
        hba->max_pwr_info.is_valid = false;
 
        /* Initialize work queues */
-       snprintf(eh_wq_name, sizeof(eh_wq_name), "ufs_eh_wq_%d",
-                hba->host->host_no);
-       hba->eh_wq = alloc_ordered_workqueue("%s", WQ_MEM_RECLAIM, eh_wq_name);
+       hba->eh_wq = alloc_ordered_workqueue("ufs_eh_wq_%d", WQ_MEM_RECLAIM,
+                                            hba->host->host_no);
        if (!hba->eh_wq) {
                dev_err(hba->dev, "%s: failed to create eh workqueue\n",
                        __func__);