openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Rafael J. Wysocki 2012-12-23 00:03:03 +01:00
parent 38a9a67a28
commit 3eec5f7a19
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/acpi/scan.c
View File

@ -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)

2
include/acpi/acpi_bus.h
View File

@ -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;
};