1 files changed, 7 insertions, 15 deletions

diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c
index 5202a584e0c6..292b103abada 100644
--- a/sound/soc/qcom/lpass-cpu.c
+++ b/sound/soc/qcom/lpass-cpu.c
@@ -429,7 +429,6 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev)
         struct lpass_variant *variant;
         struct device *dev = &pdev->dev;
         const struct of_device_id *match;
-        char clk_name[16];
         int ret, i, dai_id;
 
         dsp_of_node = of_parse_phandle(pdev->dev.of_node, "qcom,adsp", 0);
@@ -477,31 +476,24 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev)
 
         for (i = 0; i < variant->num_dai; i++) {
                 dai_id = variant->dai_driver[i].id;
-                if (variant->num_dai > 1)
-                        sprintf(clk_name, "mi2s-osr-clk%d", i);
-                else
-                        sprintf(clk_name, "mi2s-osr-clk");
-
                 drvdata->mi2s_osr_clk[dai_id] = devm_clk_get(&pdev->dev,
-                                                                clk_name);
+                                             variant->dai_osr_clk_names[i]);
                 if (IS_ERR(drvdata->mi2s_osr_clk[dai_id])) {
                         dev_warn(&pdev->dev,
-                                "error getting optional mi2s-osr-clk: %ld\n",
+                                "%s() error getting optional %s: %ld\n",
+                                __func__,
+                                variant->dai_osr_clk_names[i],
                                 PTR_ERR(drvdata->mi2s_osr_clk[dai_id]));
 
                         drvdata->mi2s_osr_clk[dai_id] = NULL;
                 }
 
-                if (variant->num_dai > 1)
-                        sprintf(clk_name, "mi2s-bit-clk%d", i);
-                else
-                        sprintf(clk_name, "mi2s-bit-clk");
-
                 drvdata->mi2s_bit_clk[dai_id] = devm_clk_get(&pdev->dev,
-                                                            clk_name);
+                                                variant->dai_bit_clk_names[i]);
                 if (IS_ERR(drvdata->mi2s_bit_clk[dai_id])) {
                         dev_err(&pdev->dev,
-                                "error getting mi2s-bit-clk: %ld\n",
+                                "error getting %s: %ld\n",
+                                variant->dai_bit_clk_names[i],
                                 PTR_ERR(drvdata->mi2s_bit_clk[dai_id]));
                         return PTR_ERR(drvdata->mi2s_bit_clk[dai_id]);
                 }