hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PCI: Simplify pci_create_attr() control flow 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1134,35 +1134,36 @@ 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;
sysfs_bin_attr_init(res_attr); res_attr_name = (char *)(res_attr + 1);
if (write_combine) {
pdev->res_attr_wc[num] = res_attr; sysfs_bin_attr_init(res_attr);
sprintf(res_attr_name, "resource%d_wc", num); if (write_combine) {
res_attr->mmap = pci_mmap_resource_wc; pdev->res_attr_wc[num] = res_attr;
} else { sprintf(res_attr_name, "resource%d_wc", num);
pdev->res_attr[num] = res_attr; res_attr->mmap = pci_mmap_resource_wc;
sprintf(res_attr_name, "resource%d", num); } else {
res_attr->mmap = pci_mmap_resource_uc; pdev->res_attr[num] = res_attr;
} sprintf(res_attr_name, "resource%d", num);
if (pci_resource_flags(pdev, num) & IORESOURCE_IO) { res_attr->mmap = pci_mmap_resource_uc;
res_attr->read = pci_read_resource_io; }
res_attr->write = pci_write_resource_io; if (pci_resource_flags(pdev, num) & IORESOURCE_IO) {
} res_attr->read = pci_read_resource_io;
res_attr->attr.name = res_attr_name; res_attr->write = pci_write_resource_io;
res_attr->attr.mode = S_IRUSR | S_IWUSR; }
res_attr->size = pci_resource_len(pdev, num); res_attr->attr.name = res_attr_name;
res_attr->private = &pdev->resource[num]; res_attr->attr.mode = S_IRUSR | S_IWUSR;
retval = sysfs_create_bin_file(&pdev->dev.kobj, res_attr); res_attr->size = pci_resource_len(pdev, num);
if (retval) res_attr->private = &pdev->resource[num];
kfree(res_attr); retval = sysfs_create_bin_file(&pdev->dev.kobj, res_attr);
} else if (retval)
retval = -ENOMEM; kfree(res_attr);
return retval; return retval;
} }