| Message ID | 085fc5ac70fc8d73d5da197967e76d18f2ab5208.1699774592.git.christophe.jaillet@wanadoo.fr |
|---|---|
| State | New |
| Headers | show |
| Series | PCI: kirin: Use devm_kasprintf() | expand |
On Sun, Nov 12, 2023 at 08:37:01AM +0100, Christophe JAILLET wrote: > Use devm_kasprintf() instead of hand writing it. > This saves the need of an intermediate buffer. > > There was also no reason to use the _const() version of devm_kstrdup(). > The string was known be not constant. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Neat cleanup. Thanks! Reviewed-by: Serge Semin <fancer.lancer@gmail.com> -Serge(y) > --- > drivers/pci/controller/dwc/pcie-kirin.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c > index 2ee146767971..d9e3514de0a0 100644 > --- a/drivers/pci/controller/dwc/pcie-kirin.c > +++ b/drivers/pci/controller/dwc/pcie-kirin.c > @@ -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; > } > -- > 2.34.1 >
Hello! [...] > @@ -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); I think, the kirin_pcie_parse_port(), which is just below form this function, might benefit from the same type of a nice change. Thoughts? Krzysztof
Le 13/11/2023 à 10:55, Krzysztof Wilczyński a écrit : > Hello! > > [...] >> @@ -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); > > I think, the kirin_pcie_parse_port(), which is just below form this > function, might benefit from the same type of a nice change. Thoughts? > > Krzysztof > Argh, yes, I've not seen it. I'll send a v2 with both. Thx for seeing it. CJ
On Sun, 12 Nov 2023, Christophe JAILLET wrote: > Use devm_kasprintf() instead of hand writing it. > This saves the need of an intermediate buffer. > > There was also no reason to use the _const() version of devm_kstrdup(). > The string was known be not constant. was known be -> is known to be With that fixed, Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c index 2ee146767971..d9e3514de0a0 100644 --- a/drivers/pci/controller/dwc/pcie-kirin.c +++ b/drivers/pci/controller/dwc/pcie-kirin.c @@ -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; }
Use devm_kasprintf() instead of hand writing it. This saves the need of an intermediate buffer. There was also no reason to use the _const() version of devm_kstrdup(). The string was known be not constant. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/pci/controller/dwc/pcie-kirin.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)