Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e723f0b4 authored by Jiang Liu's avatar Jiang Liu Committed by Bjorn Helgaas
Browse files

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: default avatarJiang Liu <jiang.liu@huawei.com>
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d5af7d98

drivers/pci/probe.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/pci/remove.c

+2 −2
Original line number Diff line number Diff line
@@ -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)