From 709fd9274103eaf4ae6bd33fa52bc8b8ea6b8479 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Mon, 22 Jun 2009 20:41:45 +0000
Subject: [PATCH] --- yaml --- r: 165263 b: refs/heads/master c:
 dcf52fb71d988ba945054308f661bddf9b2455fb h: refs/heads/master i:   165261:
 6d1124ce237f38bcf9e574cfd72f018899d0ec03   165259:
 48b452a35d166aa5e190c49556923960f33f1d09   165255:
 bdbbdbe110d76740f143574a5b1f03eaa30dea48   165247:
 a60fed7f2c6d2299e6853f260864849a0da36579 v: v3

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

diff --git a/[refs] b/[refs]
index a7ed35b479b5..5b7e76ad205a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf745ec7a1222a661b2c5f0e8c2c4be81300d2a4
+refs/heads/master: dcf52fb71d988ba945054308f661bddf9b2455fb
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
index 781435d7e369..4a89f081160f 100644
--- a/trunk/drivers/acpi/scan.c
+++ b/trunk/drivers/acpi/scan.c
@@ -426,9 +426,6 @@ static int acpi_device_probe(struct device * dev)
 		if (acpi_drv->ops.notify) {
 			ret = acpi_device_install_notify_handler(acpi_dev);
 			if (ret) {
-				if (acpi_drv->ops.stop)
-					acpi_drv->ops.stop(acpi_dev,
-						   acpi_dev->removal_type);
 				if (acpi_drv->ops.remove)
 					acpi_drv->ops.remove(acpi_dev,
 						     acpi_dev->removal_type);
@@ -452,8 +449,6 @@ static int acpi_device_remove(struct device * dev)
 	if (acpi_drv) {
 		if (acpi_drv->ops.notify)
 			acpi_device_remove_notify_handler(acpi_dev);
-		if (acpi_drv->ops.stop)
-			acpi_drv->ops.stop(acpi_dev, acpi_dev->removal_type);
 		if (acpi_drv->ops.remove)
 			acpi_drv->ops.remove(acpi_dev, acpi_dev->removal_type);
 	}
diff --git a/trunk/include/acpi/acpi_bus.h b/trunk/include/acpi/acpi_bus.h
index c65e4ce6c3af..79a6c5ebe908 100644
--- a/trunk/include/acpi/acpi_bus.h
+++ b/trunk/include/acpi/acpi_bus.h
@@ -89,7 +89,6 @@ struct acpi_device;
 typedef int (*acpi_op_add) (struct acpi_device * device);
 typedef int (*acpi_op_remove) (struct acpi_device * device, int type);
 typedef int (*acpi_op_start) (struct acpi_device * device);
-typedef int (*acpi_op_stop) (struct acpi_device * device, int type);
 typedef int (*acpi_op_suspend) (struct acpi_device * device,
 				pm_message_t state);
 typedef int (*acpi_op_resume) (struct acpi_device * device);
@@ -106,7 +105,6 @@ struct acpi_device_ops {
 	acpi_op_add add;
 	acpi_op_remove remove;
 	acpi_op_start start;
-	acpi_op_stop stop;
 	acpi_op_suspend suspend;
 	acpi_op_resume resume;
 	acpi_op_bind bind;