Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd5174df authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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: default avatarBjorn Helgaas <bhelgaas@google.com>
parent b562ec8f

drivers/pci/pci-sysfs.c

+27 −26
Original line number Original line Diff line number Diff line
@@ -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;

}

}