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

Commit b15d686a authored by Russell King's avatar Russell King Committed by Greg Kroah-Hartman
Browse files

[PATCH] Add pci_bus_type probe and remove methods 



Move the PCI bus device probe/remove methods to the bus_type
structure.  We leave the shutdown method alone since there
are compatibility issues with that.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 594c8281

drivers/pci/pci-driver.c

+2 −2
Original line number Diff line number Diff line
@@ -380,8 +380,6 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner) 
	/* initialize common driver fields */

	drv->driver.name = drv->name;

	drv->driver.bus = &pci_bus_type;

	drv->driver.probe = pci_device_probe;

	drv->driver.remove = pci_device_remove;

	/* FIXME, once all of the existing PCI drivers have been fixed to set

	 * the pci shutdown function, this test can go away. */

	if (!drv->driver.shutdown)
@@ -513,6 +511,8 @@ struct bus_type pci_bus_type = { 
	.name		= "pci",

	.match		= pci_bus_match,

	.uevent		= pci_uevent,

	.probe		= pci_device_probe,

	.remove		= pci_device_remove,

	.suspend	= pci_device_suspend,

	.resume		= pci_device_resume,

	.dev_attrs	= pci_dev_attrs,