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

Commit 81052769 authored by Yijing Wang's avatar Yijing Wang Committed by Bjorn Helgaas
Browse files

PCI/MSI: Remove unused kobject from struct msi_desc 



After commit 1c51b50c ("PCI/MSI: Export MSI mode using attributes, not
kobjects"), the kobject in struct msi_desc is unused.

Remove the unused struct kobject from struct msi_desc.

[bhelgaas: changelog]
Fixes: 1c51b50c ("PCI/MSI: Export MSI mode using attributes, not kobjects")
Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a06cd74c

drivers/pci/msi.c

+0 −11
Original line number Diff line number Diff line
@@ -374,17 +374,6 @@ static void free_msi_irqs(struct pci_dev *dev) 
				iounmap(entry->mask_base);

		}



		/*

		 * Its possible that we get into this path

		 * When populate_msi_sysfs fails, which means the entries

		 * were not registered with sysfs.  In that case don't

		 * unregister them.

		 */

		if (entry->kobj.parent) {

			kobject_del(&entry->kobj);

			kobject_put(&entry->kobj);

		}



		list_del(&entry->list);

		kfree(entry);

	}

include/linux/msi.h

+0 −2
Original line number Diff line number Diff line
@@ -47,8 +47,6 @@ struct msi_desc { 


	/* Last set MSI message */

	struct msi_msg msg;



	struct kobject kobj;

};



/*