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

Commit 1406276c authored by Jan Beulich's avatar Jan Beulich Committed by Bjorn Helgaas
Browse files

PCI/MSI: Simplify populate_msi_sysfs() 



Simplify populate_msi_sysfs() by

  - Swapping the order of the two allocations and storing the
    msi_dev_attr-derived pointer right after allocation, allowing the
    cleanup code to pick things up without extra effort.

  - Using kasprintf() instead of the kmalloc()/sprintf() pair.

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ada07b1

drivers/pci/msi.c

+6 −10
Original line number Diff line number Diff line
@@ -544,22 +544,18 @@ static int populate_msi_sysfs(struct pci_dev *pdev) 
	if (!msi_attrs)

		return -ENOMEM;

	list_for_each_entry(entry, &pdev->msi_list, list) {

		char *name = kmalloc(20, GFP_KERNEL);

		if (!name)

			goto error_attrs;



		msi_dev_attr = kzalloc(sizeof(*msi_dev_attr), GFP_KERNEL);

		if (!msi_dev_attr) {

			kfree(name);

		if (!msi_dev_attr)

			goto error_attrs;

		}

		msi_attrs[count] = &msi_dev_attr->attr;



		sprintf(name, "%d", entry->irq);

		sysfs_attr_init(&msi_dev_attr->attr);

		msi_dev_attr->attr.name = name;

		msi_dev_attr->attr.name = kasprintf(GFP_KERNEL, "%d",

						    entry->irq);

		if (!msi_dev_attr->attr.name)

			goto error_attrs;

		msi_dev_attr->attr.mode = S_IRUGO;

		msi_dev_attr->show = msi_mode_show;

		msi_attrs[count] = &msi_dev_attr->attr;

		++count;

	}