Messages in this thread Patch in this message | | | From | Rolf Evers-Fischer <> | Subject | [PATCH v4 3/3] PCI: endpoint: pci_epf_create: remove goto labels | Date | Wed, 28 Feb 2018 14:07:19 +0100 |
| |
From: Rolf Evers-Fischer <rolf.evers.fischer@aptiv.com>
Removes the goto labels completely, handles the errors at the respective call site and just returns instead of jumping around.
Signed-off-by: Rolf Evers-Fischer <rolf.evers.fischer@aptiv.com> --- drivers/pci/endpoint/pci-epf-core.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-)
diff --git a/drivers/pci/endpoint/pci-epf-core.c b/drivers/pci/endpoint/pci-epf-core.c index 1878a6776519..cf2c4f6590a0 100644 --- a/drivers/pci/endpoint/pci-epf-core.c +++ b/drivers/pci/endpoint/pci-epf-core.c @@ -203,16 +203,14 @@ struct pci_epf *pci_epf_create(const char *name) int len; epf = kzalloc(sizeof(*epf), GFP_KERNEL); - if (!epf) { - ret = -ENOMEM; - goto err_ret; - } + if (!epf) + return ERR_PTR(-ENOMEM); len = strchrnul(name, '.') - name; epf->name = kstrndup(name, len, GFP_KERNEL); if (!epf->name) { - ret = -ENOMEM; - goto free_epf; + kfree(epf); + return ERR_PTR(-ENOMEM); } dev = &epf->dev; @@ -221,24 +219,14 @@ struct pci_epf *pci_epf_create(const char *name) dev->type = &pci_epf_type; ret = dev_set_name(dev, "%s", name); - if (ret) - goto put_dev; - - ret = device_add(dev); - if (ret) - goto put_dev; - - return epf; + if (!ret) { + ret = device_add(dev); + if (!ret) + return epf; + } -put_dev: put_device(dev); return ERR_PTR(ret); - -free_epf: - kfree(epf); - -err_ret: - return ERR_PTR(ret); } EXPORT_SYMBOL_GPL(pci_epf_create); -- 2.16.2
| |