summaryrefslogtreecommitdiffstats
path: root/drivers/pci/remove.c
diff options
context:
space:
mode:
authorJiang Liu <jiang.liu@huawei.com>2013-01-21 13:20:46 -0800
committerBjorn Helgaas <bhelgaas@google.com>2013-01-25 14:42:06 -0700
commite723f0b4f4ecaf3fdd542124b3f99379ab8df757 (patch)
tree86504b0376a652be0cda11618623259cc99bcb8d /drivers/pci/remove.c
parentd5af7d987a494a1b85e176b4c33dc115cb111662 (diff)
downloadlinux-stable-e723f0b4f4ecaf3fdd542124b3f99379ab8df757.tar.gz
linux-stable-e723f0b4f4ecaf3fdd542124b3f99379ab8df757.tar.bz2
linux-stable-e723f0b4f4ecaf3fdd542124b3f99379ab8df757.zip
PCI: Make device create/destroy logic symmetric
According to device model documentation, the way to create/destroy PCI devices should be symmetric. The rule is to either use 1) device_register()/device_unregister() or 2) device_initialize()/device_add()/device_del()/put_device(). So change PCI core logic to follow the rule and get rid of the redundant pci_dev_get()/pci_dev_put() pair. Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/pci/remove.c')
-rw-r--r--drivers/pci/remove.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 7c0fd9252e6f..fc38c4883e1d 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -22,7 +22,7 @@ static void pci_stop_dev(struct pci_dev *dev)
if (dev->is_added) {
pci_proc_detach_device(dev);
pci_remove_sysfs_dev_files(dev);
- device_unregister(&dev->dev);
+ device_del(&dev->dev);
dev->is_added = 0;
}
@@ -37,7 +37,7 @@ static void pci_destroy_dev(struct pci_dev *dev)
up_write(&pci_bus_sem);
pci_free_resources(dev);
- pci_dev_put(dev);
+ put_device(&dev->dev);
}
void pci_remove_bus(struct pci_bus *bus)