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>

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index b97dea5784ffca7d9fbf634ccdac31d403a8bc0b..48b35e15374d65f04ee7040144ad2084a1d5e867 100644 (file)
--- 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)
 {
        device_initialize(&dev->dev);
        dev->dev.release = pci_release_dev;
-       pci_dev_get(dev);
 
        set_dev_node(&dev->dev, pcibus_to_node(bus));
        dev->dev.dma_mask = &dev->dma_mask;

diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 7c0fd9252e6f03c1b1f17f53282be0c5a1fdb57d..fc38c4883e1d4e0459b0c68430cded587dd71bcf 100644 (file)
--- 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)