PCI/MSI: Remove unused kobject from struct msi_desc

After commit 1c51b50c2995 ("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: 1c51b50c2995 ("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>

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 5f1e5dc994cf2c1bb83806aa3fa2afcaa59a0fa3..97d6ef67a3c82967ea2f884c73c44bc9af983811 100644 (file)
--- 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
index dbf7cc93244434d6905e9ae67565b183228a3079..5a91c2d58ffd5bb935e84923a4db56f0a509aa81 100644 (file)
--- 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;
 };
 
 /*