PCI/MSI: Remove unused kobject from struct msi_desc

After commit 1c51b50 ("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: 1c51b50 ("PCI/MSI: Export MSI mode using attributes, not kobjects") Signed-off-by: Yijing Wang <wangyijing@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
git-mirror · Oct 1, 2014 · 8105276 · 8105276
1 parent a06cd74
commit 8105276
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
@@ -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);
 	}

diff --git a/include/linux/msi.h b/include/linux/msi.h
@@ -47,8 +47,6 @@ struct msi_desc {
 
 	/* Last set MSI message */
 	struct msi_msg msg;
-
-	struct kobject kobj;
 };
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,8 +47,6 @@ struct msi_desc { @@
     	/* Last set MSI message */
     	struct msi_msg msg;
-    	struct kobject kobj;
     };
     /*
@@ Expand Down @@