PCI: endpoint: Simplify name allocation for EPF device

This commit replaces allocating and freeing the intermediate
'buf'/'func_name' with a combination of 'kstrndup()' and 'len'.

'len' is the required length of 'epf->name'.
'epf->name' should be either the first part of 'name' preceding the '.'
or the complete 'name', if there is no '.' in the name.

Signed-off-by: Rolf Evers-Fischer <rolf.evers.fischer@aptiv.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Kishon Vijay Abraham I <kishon@ti.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c
index 766ce1d..1f2506f 100644 (file)
--- a/drivers/pci/endpoint/pci-epf-core.c
+++ b/drivers/pci/endpoint/pci-epf-core.c
@@ -200,8 +200,7 @@ struct pci_epf *pci_epf_create(const char *name)
        int ret;
        struct pci_epf *epf;
        struct device *dev;
-       char *func_name;
-       char *buf;
+       int len;
 
        epf = kzalloc(sizeof(*epf), GFP_KERNEL);
        if (!epf) {
@@ -209,20 +208,11 @@ struct pci_epf *pci_epf_create(const char *name)
                goto err_ret;
        }
 
-       buf = kstrdup(name, GFP_KERNEL);
-       if (!buf) {
-               ret = -ENOMEM;
-               goto free_epf;
-       }
-
-       func_name = buf;
-       buf = strchrnul(buf, '.');
-       *buf = '\0';
-
-       epf->name = kstrdup(func_name, GFP_KERNEL);
+       len = strchrnul(name, '.') - name;
+       epf->name = kstrndup(name, len, GFP_KERNEL);
        if (!epf->name) {
                ret = -ENOMEM;
-               goto free_func_name;
+               goto free_epf;
        }
 
        dev = &epf->dev;
@@ -238,16 +228,12 @@ struct pci_epf *pci_epf_create(const char *name)
        if (ret)
                goto put_dev;
 
-       kfree(func_name);
        return epf;
 
 put_dev:
        put_device(dev);
        kfree(epf->name);
 
-free_func_name:
-       kfree(func_name);
-
 free_epf:
        kfree(epf);