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

Commit ef37702e authored by Yinghai Lu's avatar Yinghai Lu Committed by Bjorn Helgaas
Browse files

PCI: Move pci_proc_attach_device() to pci_bus_add_device() 



4f535093 ("PCI: Put pci_dev in device tree as early as possible")
moved pci_proc_attach_device() from pci_bus_add_device() to
pci_device_add().

This moves it back to pci_bus_add_device(), essentially reverting that
part of 4f535093.  This makes it symmetric with pci_stop_dev(),
where we call pci_proc_detach_device() and pci_remove_sysfs_dev_files()
and set dev->is_added = 0.

[bhelgaas: changelog, create sysfs then attach proc for symmetry]
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent e3b439e1

drivers/pci/bus.c

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ int pci_bus_add_device(struct pci_dev *dev) 
	 */

	pci_fixup_device(pci_fixup_final, dev);

	pci_create_sysfs_dev_files(dev);

	pci_proc_attach_device(dev);



	dev->match_driver = true;

	retval = device_attach(&dev->dev);

drivers/pci/probe.c

+0 −2
Original line number Diff line number Diff line
@@ -1381,8 +1381,6 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) 
	dev->match_driver = false;

	ret = device_add(&dev->dev);

	WARN_ON(ret < 0);



	pci_proc_attach_device(dev);

}



struct pci_dev *__ref pci_scan_single_device(struct pci_bus *bus, int devfn)