Skip to content

Commit 9f5077e

Browse files
tititiou36kwilczynski
authored andcommitted
PCI: kirin: Use devm_kasprintf() to dynamically allocate clock names
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 <[email protected]> Signed-off-by: Krzysztof Wilczyński <[email protected]> Reviewed-by: Ilpo Järvinen <[email protected]>
1 parent b85ea95 commit 9f5077e

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

drivers/pci/controller/dwc/pcie-kirin.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ static int kirin_pcie_get_gpio_enable(struct kirin_pcie *pcie,
366366
struct platform_device *pdev)
367367
{
368368
struct device *dev = &pdev->dev;
369-
char name[32];
370369
int ret, i;
371370

372371
/* This is an optional property */
@@ -387,9 +386,8 @@ static int kirin_pcie_get_gpio_enable(struct kirin_pcie *pcie,
387386
if (pcie->gpio_id_clkreq[i] < 0)
388387
return pcie->gpio_id_clkreq[i];
389388

390-
sprintf(name, "pcie_clkreq_%d", i);
391-
pcie->clkreq_names[i] = devm_kstrdup_const(dev, name,
392-
GFP_KERNEL);
389+
pcie->clkreq_names[i] = devm_kasprintf(dev, GFP_KERNEL,
390+
"pcie_clkreq_%d", i);
393391
if (!pcie->clkreq_names[i])
394392
return -ENOMEM;
395393
}
@@ -404,7 +402,6 @@ static int kirin_pcie_parse_port(struct kirin_pcie *pcie,
404402
struct device *dev = &pdev->dev;
405403
struct device_node *parent, *child;
406404
int ret, slot, i;
407-
char name[32];
408405

409406
for_each_available_child_of_node(node, parent) {
410407
for_each_available_child_of_node(parent, child) {
@@ -430,9 +427,9 @@ static int kirin_pcie_parse_port(struct kirin_pcie *pcie,
430427

431428
slot = PCI_SLOT(ret);
432429

433-
sprintf(name, "pcie_perst_%d", slot);
434-
pcie->reset_names[i] = devm_kstrdup_const(dev, name,
435-
GFP_KERNEL);
430+
pcie->reset_names[i] = devm_kasprintf(dev, GFP_KERNEL,
431+
"pcie_perst_%d",
432+
slot);
436433
if (!pcie->reset_names[i]) {
437434
ret = -ENOMEM;
438435
goto put_node;

0 commit comments

Comments
 (0)