aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Gerst <bgerst@didntduck.org>2006-02-19 16:05:52 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-23 14:35:13 -0800
commit50defa1ccaffc197a133d92acb48d696d5ea3539 (patch)
treee1d36dfe9ad28db0c639502ba55c6bb70c1e0af3
parente6b82b13c4066ca091a4919620d6403c8a269bc3 (diff)
[PATCH] PCI: Add pci_device_shutdown to pci_bus_type
The extra compatability code is not necessary. Any code still using the old shutdown method will trigger the warning in driver_register() instead. Signed-off-by: Brian Gerst <bgerst@didntduck.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/pci/pci-driver.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 0aa14c92b57..eb5b50c8770 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -380,14 +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;
- /* 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)
- drv->driver.shutdown = pci_device_shutdown;
- else
- printk(KERN_WARNING "Warning: PCI driver %s has a struct "
- "device_driver shutdown method, please update!\n",
- drv->name);
drv->driver.owner = owner;
drv->driver.kobj.ktype = &pci_driver_kobj_type;
@@ -514,6 +506,7 @@ struct bus_type pci_bus_type = {
.probe = pci_device_probe,
.remove = pci_device_remove,
.suspend = pci_device_suspend,
+ .shutdown = pci_device_shutdown,
.resume = pci_device_resume,
.dev_attrs = pci_dev_attrs,
};