aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/probe.c
diff options
context:
space:
mode:
authorJiang Liu <jiang.liu@huawei.com>2013-01-21 16:20:46 -0500
committerBjorn Helgaas <bhelgaas@google.com>2013-01-25 16:42:06 -0500
commite723f0b4f4ecaf3fdd542124b3f99379ab8df757 (patch)
tree86504b0376a652be0cda11618623259cc99bcb8d /drivers/pci/probe.c
parentd5af7d987a494a1b85e176b4c33dc115cb111662 (diff)
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/probe.c')
-rw-r--r--drivers/pci/probe.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index b97dea5784ff..48b35e15374d 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1298,7 +1298,6 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
1298{ 1298{
1299 device_initialize(&dev->dev); 1299 device_initialize(&dev->dev);
1300 dev->dev.release = pci_release_dev; 1300 dev->dev.release = pci_release_dev;
1301 pci_dev_get(dev);
1302 1301
1303 set_dev_node(&dev->dev, pcibus_to_node(bus)); 1302 set_dev_node(&dev->dev, pcibus_to_node(bus));
1304 dev->dev.dma_mask = &dev->dma_mask; 1303 dev->dev.dma_mask = &dev->dma_mask;