Skip to content

Commit

Permalink
ACPI: Drop ACPI device .bind() and .unbind() callbacks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki committed Jan 3, 2013
1 parent 38a9a67 commit 3eec5f7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 24 deletions.
22 changes: 0 additions & 22 deletions drivers/acpi/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions include/acpi/acpi_bus.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

Expand Down

0 comments on commit 3eec5f7

Please sign in to comment.