Add pci_device_shutdown to pci_bus_type
PATCH 1/1 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 <[email protected]>
---
drivers/pci/pci-driver.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-)
drivers/pci/pci-driver.c +1 -8
@@ -380,14 +380,6 @@ int __pci_register_driver(struct pci_dri/* 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, };