diff options
| author | Russell King <rmk@arm.linux.org.uk> | 2006-01-05 15:30:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-13 20:26:04 +0100 |
| commit | b15d686a2b589c9e4f1ea116553e9c3c3d030dae (patch) | |
| tree | a4412435d021a65c38a4e91b2ec6e94aaba76ce2 /drivers | |
| parent | [PATCH] Add bus_type probe, remove, shutdown methods. (diff) | |
| download | linux-b15d686a2b589c9e4f1ea116553e9c3c3d030dae.tar.xz linux-b15d686a2b589c9e4f1ea116553e9c3c3d030dae.zip | |
[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.c | 4 |
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) /* 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, |