aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-03-24 12:55:27 -0400
committerLen Brown <len.brown@intel.com>2009-03-27 18:03:48 -0400
commitc0ce093f5b8bc3262c51bd0b5900424a67909831 (patch)
treeb6700dfee290e2110f4df704f6f463d094627e07
parent93b3e78a93a2f49415608929f9ffeb60adc8a4a8 (diff)
ACPI: remove unused acpi_device_ops .shutdown method
No drivers use the .shutdown method, so remove it. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/scan.c12
-rw-r--r--include/acpi/acpi_bus.h2
2 files changed, 0 insertions, 14 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index c54d7b6c4066..4a6c7ee834ff 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -395,22 +395,10 @@ static int acpi_device_remove(struct device * dev)
395 return 0; 395 return 0;
396} 396}
397 397
398static void acpi_device_shutdown(struct device *dev)
399{
400 struct acpi_device *acpi_dev = to_acpi_device(dev);
401 struct acpi_driver *acpi_drv = acpi_dev->driver;
402
403 if (acpi_drv && acpi_drv->ops.shutdown)
404 acpi_drv->ops.shutdown(acpi_dev);
405
406 return ;
407}
408
409struct bus_type acpi_bus_type = { 398struct bus_type acpi_bus_type = {
410 .name = "acpi", 399 .name = "acpi",
411 .suspend = acpi_device_suspend, 400 .suspend = acpi_device_suspend,
412 .resume = acpi_device_resume, 401 .resume = acpi_device_resume,
413 .shutdown = acpi_device_shutdown,
414 .match = acpi_bus_match, 402 .match = acpi_bus_match,
415 .probe = acpi_device_probe, 403 .probe = acpi_device_probe,
416 .remove = acpi_device_remove, 404 .remove = acpi_device_remove,
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index e3c5a4e81262..fb91bc213781 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -95,7 +95,6 @@ typedef int (*acpi_op_suspend) (struct acpi_device * device,
95typedef int (*acpi_op_resume) (struct acpi_device * device); 95typedef int (*acpi_op_resume) (struct acpi_device * device);
96typedef int (*acpi_op_bind) (struct acpi_device * device); 96typedef int (*acpi_op_bind) (struct acpi_device * device);
97typedef int (*acpi_op_unbind) (struct acpi_device * device); 97typedef int (*acpi_op_unbind) (struct acpi_device * device);
98typedef int (*acpi_op_shutdown) (struct acpi_device * device);
99 98
100struct acpi_bus_ops { 99struct acpi_bus_ops {
101 u32 acpi_op_add:1; 100 u32 acpi_op_add:1;
@@ -121,7 +120,6 @@ struct acpi_device_ops {
121 acpi_op_resume resume; 120 acpi_op_resume resume;
122 acpi_op_bind bind; 121 acpi_op_bind bind;
123 acpi_op_unbind unbind; 122 acpi_op_unbind unbind;
124 acpi_op_shutdown shutdown;
125}; 123};
126 124
127struct acpi_driver { 125struct acpi_driver {