Skip to content

Commit

Permalink
ACPI / hotplug: Drop unfinished global notification handling routines
Browse files Browse the repository at this point in the history
There are two global hotplug notification handling routines in bus.c,
acpi_bus_check_device() and acpi_bus_check_scope(), that have never
been finished and don't do anything useful, so drop them.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Rafael J. Wysocki committed Nov 22, 2013
1 parent 443fc82 commit f4b734c
Showing 1 changed file with 2 additions and 62 deletions.
64 changes: 2 additions & 62 deletions drivers/acpi/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -329,58 +329,6 @@ static void acpi_bus_osc_support(void)
Notification Handling
-------------------------------------------------------------------------- */

static void acpi_bus_check_device(acpi_handle handle)
{
struct acpi_device *device;
acpi_status status;
struct acpi_device_status old_status;

if (acpi_bus_get_device(handle, &device))
return;
if (!device)
return;

old_status = device->status;

/*
* Make sure this device's parent is present before we go about
* messing with the device.
*/
if (device->parent && !device->parent->status.present) {
device->status = device->parent->status;
return;
}

status = acpi_bus_get_status(device);
if (ACPI_FAILURE(status))
return;

if (STRUCT_TO_INT(old_status) == STRUCT_TO_INT(device->status))
return;

/*
* Device Insertion/Removal
*/
if ((device->status.present) && !(old_status.present)) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device insertion detected\n"));
/* TBD: Handle device insertion */
} else if (!(device->status.present) && (old_status.present)) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device removal detected\n"));
/* TBD: Handle device removal */
}
}

static void acpi_bus_check_scope(acpi_handle handle)
{
/* Status Change? */
acpi_bus_check_device(handle);

/*
* TBD: Enumerate child devices within this device's scope and
* run acpi_bus_check_device()'s on them.
*/
}

/**
* acpi_bus_notify
* ---------------
Expand All @@ -397,19 +345,11 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
switch (type) {

case ACPI_NOTIFY_BUS_CHECK:
acpi_bus_check_scope(handle);
/*
* TBD: We'll need to outsource certain events to non-ACPI
* drivers via the device manager (device.c).
*/
/* TBD */
break;

case ACPI_NOTIFY_DEVICE_CHECK:
acpi_bus_check_device(handle);
/*
* TBD: We'll need to outsource certain events to non-ACPI
* drivers via the device manager (device.c).
*/
/* TBD */
break;

case ACPI_NOTIFY_DEVICE_WAKE:
Expand Down

0 comments on commit f4b734c

Please sign in to comment.