PCI: Simplify pci_create_attr() control flow (bd5174df) · Commits · 戴 / test

drivers/pci/pci-sysfs.c

+27 −26

Original line number	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 */
		int name_len = write_combine ? 13 : 10;
		struct bin_attribute *res_attr;
		char *res_attr_name;
		int retval;

		res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
		if (res_attr) {
		char res_attr_name = (char )(res_attr + 1);
		if (!res_attr)
		return -ENOMEM;

		res_attr_name = (char *)(res_attr + 1);

		sysfs_bin_attr_init(res_attr);
		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);
		if (retval)
		kfree(res_attr);
		} else
		retval = -ENOMEM;

		return retval;
		}