[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>
This commit is contained in:
parent
e6b82b13c4
commit
50defa1cca
|
@ -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,
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue