From 146c553805cde1f31a928d760fb47b5db9302194 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Tue, 24 Mar 2009 10:55:27 -0600
Subject: [PATCH] --- yaml --- r: 141894 b: refs/heads/master c:
 c0ce093f5b8bc3262c51bd0b5900424a67909831 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/acpi/scan.c     | 12 ------------
 trunk/include/acpi/acpi_bus.h |  2 --
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 9be9c29e9d98..6bcc76ccfc1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93b3e78a93a2f49415608929f9ffeb60adc8a4a8
+refs/heads/master: c0ce093f5b8bc3262c51bd0b5900424a67909831
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
index c54d7b6c4066..4a6c7ee834ff 100644
--- a/trunk/drivers/acpi/scan.c
+++ b/trunk/drivers/acpi/scan.c
@@ -395,22 +395,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,
diff --git a/trunk/include/acpi/acpi_bus.h b/trunk/include/acpi/acpi_bus.h
index e3c5a4e81262..fb91bc213781 100644
--- a/trunk/include/acpi/acpi_bus.h
+++ b/trunk/include/acpi/acpi_bus.h
@@ -95,7 +95,6 @@ typedef int (*acpi_op_suspend) (struct acpi_device * device,
 typedef int (*acpi_op_resume) (struct acpi_device * device);
 typedef int (*acpi_op_bind) (struct acpi_device * device);
 typedef int (*acpi_op_unbind) (struct acpi_device * device);
-typedef int (*acpi_op_shutdown) (struct acpi_device * device);
 
 struct acpi_bus_ops {
 	u32 acpi_op_add:1;
@@ -121,7 +120,6 @@ struct acpi_device_ops {
 	acpi_op_resume resume;
 	acpi_op_bind bind;
 	acpi_op_unbind unbind;
-	acpi_op_shutdown shutdown;
 };
 
 struct acpi_driver {