Patchwork [16/16] ACPI: Drop ACPI device .bind() and .unbind() callbacks

login
register
mail settings
Submitter Rafael J. Wysocki
Date Dec. 20, 2012, 2 a.m.
Message ID <2326457.ZgAhayTgyl@vostro.rjw.lan>
Download mbox | patch
Permalink /patch/207584/
State Not Applicable
Headers show

Comments

Rafael J. Wysocki - Dec. 20, 2012, 2 a.m.
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

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>
---
 drivers/acpi/scan.c     |   22 ----------------------
 include/acpi/acpi_bus.h |    2 --
 2 files changed, 24 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: linux/drivers/acpi/scan.c
===================================================================
--- linux.orig/drivers/acpi/scan.c
+++ linux/drivers/acpi/scan.c
@@ -1426,29 +1426,11 @@  static int acpi_bus_remove(struct acpi_d
 	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)
@@ -1520,9 +1502,6 @@  static int acpi_add_single_object(struct
 	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);
@@ -1625,7 +1604,6 @@  static acpi_status acpi_bus_check_add(ac
 		return AE_CTRL_DEPTH;
 
 	device->flags.match_driver = true;
-	acpi_hot_add_bind(device);
 
  out:
 	if (!*return_value)
Index: linux/include/acpi/acpi_bus.h
===================================================================
--- linux.orig/include/acpi/acpi_bus.h
+++ linux/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;
 };