aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk@arm.linux.org.uk>2006-01-05 09:30:22 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-13 14:26:04 -0500
commitb15d686a2b589c9e4f1ea116553e9c3c3d030dae (patch)
treea4412435d021a65c38a4e91b2ec6e94aaba76ce2 /drivers
parent594c8281f90560faf9632d91bb9d402cbe560e63 (diff)
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/pci-driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 7146b69b812c..0aa14c92b570 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -380,8 +380,6 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner)
380 /* initialize common driver fields */ 380 /* initialize common driver fields */
381 drv->driver.name = drv->name; 381 drv->driver.name = drv->name;
382 drv->driver.bus = &pci_bus_type; 382 drv->driver.bus = &pci_bus_type;
383 drv->driver.probe = pci_device_probe;
384 drv->driver.remove = pci_device_remove;
385 /* FIXME, once all of the existing PCI drivers have been fixed to set 383 /* FIXME, once all of the existing PCI drivers have been fixed to set
386 * the pci shutdown function, this test can go away. */ 384 * the pci shutdown function, this test can go away. */
387 if (!drv->driver.shutdown) 385 if (!drv->driver.shutdown)
@@ -513,6 +511,8 @@ struct bus_type pci_bus_type = {
513 .name = "pci", 511 .name = "pci",
514 .match = pci_bus_match, 512 .match = pci_bus_match,
515 .uevent = pci_uevent, 513 .uevent = pci_uevent,
514 .probe = pci_device_probe,
515 .remove = pci_device_remove,
516 .suspend = pci_device_suspend, 516 .suspend = pci_device_suspend,
517 .resume = pci_device_resume, 517 .resume = pci_device_resume,
518 .dev_attrs = pci_dev_attrs, 518 .dev_attrs = pci_dev_attrs,