diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:38:51 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:38:51 -0400 |
| commit | 493837009665a5ea1d91ed5fe4bab0ed546cae86 (patch) | |
| tree | de73923763862e145949b57249b1472446009fec /drivers | |
| parent | e857b33d1879fc4284e3151222eee2415c1de88a (diff) | |
| parent | 8308e8ab70fd5d7b78afb133c51c5079548ba84f (diff) | |
| download | linux-3.10-493837009665a5ea1d91ed5fe4bab0ed546cae86.tar.gz linux-3.10-493837009665a5ea1d91ed5fe4bab0ed546cae86.tar.bz2 linux-3.10-493837009665a5ea1d91ed5fe4bab0ed546cae86.zip | |
Merge branch 'driver-ops-cleanup' into release
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/scan.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index c548231965e..b7308efce45 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -397,22 +397,10 @@ static int acpi_device_remove(struct device * dev) return 0; } -static void acpi_device_shutdown(struct device *dev) -{ - struct acpi_device *acpi_dev = to_acpi_device(dev); - struct acpi_driver *acpi_drv = acpi_dev->driver; - - if (acpi_drv && acpi_drv->ops.shutdown) - acpi_drv->ops.shutdown(acpi_dev); - - return ; -} - struct bus_type acpi_bus_type = { .name = "acpi", .suspend = acpi_device_suspend, .resume = acpi_device_resume, - .shutdown = acpi_device_shutdown, .match = acpi_bus_match, .probe = acpi_device_probe, .remove = acpi_device_remove, |