[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: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Russell King 2006-01-05 14:30:22 +00:00 committed by Greg Kroah-Hartman
parent 594c8281f9
commit b15d686a2b
1 changed files with 2 additions and 2 deletions

View File

@ -380,8 +380,6 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner)
/* initialize common driver fields */ /* initialize common driver fields */
drv->driver.name = drv->name; drv->driver.name = drv->name;
drv->driver.bus = &pci_bus_type; 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 /* FIXME, once all of the existing PCI drivers have been fixed to set
* the pci shutdown function, this test can go away. */ * the pci shutdown function, this test can go away. */
if (!drv->driver.shutdown) if (!drv->driver.shutdown)
@ -513,6 +511,8 @@ struct bus_type pci_bus_type = {
.name = "pci", .name = "pci",
.match = pci_bus_match, .match = pci_bus_match,
.uevent = pci_uevent, .uevent = pci_uevent,
.probe = pci_device_probe,
.remove = pci_device_remove,
.suspend = pci_device_suspend, .suspend = pci_device_suspend,
.resume = pci_device_resume, .resume = pci_device_resume,
.dev_attrs = pci_dev_attrs, .dev_attrs = pci_dev_attrs,