From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 22 Dec 2012 23:03:03 +0000 (+0100)
Subject: ACPI: Drop ACPI device .bind() and .unbind() callbacks
X-Git-Tag: next-20130218~84^2~10^2^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3eec5f7a1955ead549020ec2f60235ea6a4a2252;p=karo-tx-linux.git

ACPI: Drop ACPI device .bind() and .unbind() callbacks

Drop the .bind() and .unbind() that have no more users from
struct acpi_device_ops and remove all of the code referring to
them from drivers/acpi/scan.c.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
---

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 3d44c705a3a2..f8a0d0f7d197 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1385,29 +1385,11 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)
 	if (!rmdevice)
 		return 0;
 
-	/*
-	 * unbind _ADR-Based Devices when hot removal
-	 */
-	if (dev->flags.bus_address) {
-		if ((dev->parent) && (dev->parent->ops.unbind))
-			dev->parent->ops.unbind(dev);
-	}
 	acpi_device_unregister(dev, ACPI_BUS_REMOVAL_EJECT);
 
 	return 0;
 }
 
-/*
- * acpi_hot_add_bind - Bind _ADR-based devices on hot-add.
- * @device: ACPI device node to bind.
- */
-static void acpi_hot_add_bind(struct acpi_device *device)
-{
-	if (device->flags.bus_address
-	    && device->parent && device->parent->ops.bind)
-		device->parent->ops.bind(device);
-}
-
 static int acpi_add_single_object(struct acpi_device **child,
 				  acpi_handle handle, int type,
 				  unsigned long long sta, bool match_driver)
@@ -1479,9 +1461,6 @@ static int acpi_add_single_object(struct acpi_device **child,
 	device->flags.match_driver = match_driver;
 	result = acpi_device_register(device);
 
-	if (device->flags.match_driver)
-		acpi_hot_add_bind(device);
-
 end:
 	if (!result) {
 		acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
@@ -1584,7 +1563,6 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
 		return AE_CTRL_DEPTH;
 
 	device->flags.match_driver = true;
-	acpi_hot_add_bind(device);
 
  out:
 	if (!*return_value)
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 70647313a9bc..6e9a73e05916 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -99,8 +99,6 @@ struct acpi_device_ops {
 	acpi_op_add add;
 	acpi_op_remove remove;
 	acpi_op_start start;
-	acpi_op_bind bind;
-	acpi_op_unbind unbind;
 	acpi_op_notify notify;
 };