]> git.itanic.dy.fi Git - linux-stable/commitdiff
PCI: kirin: Use devm_kasprintf() to dynamically allocate clock names
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Sat, 18 Nov 2023 07:55:48 +0000 (08:55 +0100)
committerKrzysztof Wilczyński <kwilczynski@kernel.org>
Sun, 17 Dec 2023 03:02:33 +0000 (03:02 +0000)
Use devm_kasprintf() instead of open coding it.  This saves the need of
an intermediate buffer.

There was also no reason to use devm_kstrdup_const() as string is known
to be constant.

[kwilczynski: commit log, and add missing Reviewed-by tag]
Link: https://lore.kernel.org/linux-pci/1bad6879083a7d836c8a47418a0afa22485e8f69.1700294127.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/pci/controller/dwc/pcie-kirin.c

index 2ee146767971c3d41af3e9e3916c6a3f29090afc..982f854bc39c1fa4c06a4618de1a62239a6bd384 100644 (file)
@@ -366,7 +366,6 @@ static int kirin_pcie_get_gpio_enable(struct kirin_pcie *pcie,
                                      struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
-       char name[32];
        int ret, i;
 
        /* This is an optional property */
@@ -387,9 +386,8 @@ static int kirin_pcie_get_gpio_enable(struct kirin_pcie *pcie,
                if (pcie->gpio_id_clkreq[i] < 0)
                        return pcie->gpio_id_clkreq[i];
 
-               sprintf(name, "pcie_clkreq_%d", i);
-               pcie->clkreq_names[i] = devm_kstrdup_const(dev, name,
-                                                           GFP_KERNEL);
+               pcie->clkreq_names[i] = devm_kasprintf(dev, GFP_KERNEL,
+                                                      "pcie_clkreq_%d", i);
                if (!pcie->clkreq_names[i])
                        return -ENOMEM;
        }
@@ -404,7 +402,6 @@ static int kirin_pcie_parse_port(struct kirin_pcie *pcie,
        struct device *dev = &pdev->dev;
        struct device_node *parent, *child;
        int ret, slot, i;
-       char name[32];
 
        for_each_available_child_of_node(node, parent) {
                for_each_available_child_of_node(parent, child) {
@@ -430,9 +427,9 @@ static int kirin_pcie_parse_port(struct kirin_pcie *pcie,
 
                        slot = PCI_SLOT(ret);
 
-                       sprintf(name, "pcie_perst_%d", slot);
-                       pcie->reset_names[i] = devm_kstrdup_const(dev, name,
-                                                               GFP_KERNEL);
+                       pcie->reset_names[i] = devm_kasprintf(dev, GFP_KERNEL,
+                                                             "pcie_perst_%d",
+                                                             slot);
                        if (!pcie->reset_names[i]) {
                                ret = -ENOMEM;
                                goto put_node;