diff options
| author | Yijing Wang <wangyijing@huawei.com> | 2014-09-23 09:27:22 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-01 22:21:23 +0400 |
| commit | 81052769e48609525c452d8f078a5786b673e178 (patch) | |
| tree | d54ca80912c035218f20c501509ed9ed459a0be5 | |
| parent | a06cd74cefe754341f747ddc4cf7b0058fa9bff8 (diff) | |
| download | linux-81052769e48609525c452d8f078a5786b673e178.tar.xz | |
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>
| -rw-r--r-- | drivers/pci/msi.c | 11 | ||||
| -rw-r--r-- | include/linux/msi.h | 2 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 5f1e5dc994cf..97d6ef67a3c8 100644 --- 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 dbf7cc932444..5a91c2d58ffd 100644 --- 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; }; /* |