PCI: Move pci_proc_attach_device() to pci_bus_add_device() (ef37702e) · Commits · 戴 / test

("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 . 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:

Yinghai Lu <yinghai@kernel.org> Signed-off-by:

Bjorn Helgaas <bhelgaas@google.com>

drivers/pci/bus.c

+1 −0

Original line number	Original line	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_fixup_device(pci_fixup_final, dev);
	pci_create_sysfs_dev_files(dev);		pci_create_sysfs_dev_files(dev);
			pci_proc_attach_device(dev);

	dev->match_driver = true;		dev->match_driver = true;
	retval = device_attach(&dev->dev);		retval = device_attach(&dev->dev);

drivers/pci/probe.c

+0 −2

Original line number	Original line	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;		dev->match_driver = false;
	ret = device_add(&dev->dev);		ret = device_add(&dev->dev);
	WARN_ON(ret < 0);		WARN_ON(ret < 0);

	pci_proc_attach_device(dev);
	}		}

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

Admin message