leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI: Simplify pci_create_attr() control flow

Browse Source 
Return error immediately to simplify the control flow in pci_create_attr().
No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Bjorn Helgaas
2016-03-10 14:36:34 -06:00
parent b562ec8f74
commit bd5174dfb6
1 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/pci/pci-sysfs.c
View File

@@ -1134,11 +1134,14 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
/* allocate attribute structure, piggyback attribute name */ /* allocate attribute structure, piggyback attribute name */
int name_len = write_combine ? 13 : 10; int name_len = write_combine ? 13 : 10;
struct bin_attribute *res_attr; struct bin_attribute *res_attr;
char *res_attr_name;
int retval; int retval;
res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC); res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
if (res_attr) { if (!res_attr)
char *res_attr_name = (char *)(res_attr + 1); return -ENOMEM;
res_attr_name = (char *)(res_attr + 1);
sysfs_bin_attr_init(res_attr); sysfs_bin_attr_init(res_attr);
if (write_combine) { if (write_combine) {
@@ -1161,8 +1164,6 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
retval = sysfs_create_bin_file(&pdev->dev.kobj, res_attr); retval = sysfs_create_bin_file(&pdev->dev.kobj, res_attr);
if (retval) if (retval)
kfree(res_attr); kfree(res_attr);
} else
retval = -ENOMEM;
return retval; return retval;
} }