Commit 5993c467 authored by Yinghai Lu's avatar Yinghai Lu Committed by Rafael J. Wysocki

ACPI: update ej_event interface to take acpi_device

Should use acpi_device pointer directly instead of use handle and
get the device pointer again later.
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 05404d8f
...@@ -361,7 +361,7 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data) ...@@ -361,7 +361,7 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
break; break;
} }
ej_event->handle = handle; ej_event->device = device;
ej_event->event = ACPI_NOTIFY_EJECT_REQUEST; ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
acpi_os_hotplug_execute(acpi_bus_hot_remove_device, acpi_os_hotplug_execute(acpi_bus_hot_remove_device,
(void *)ej_event); (void *)ej_event);
......
...@@ -733,7 +733,7 @@ static void acpi_processor_hotplug_notify(acpi_handle handle, ...@@ -733,7 +733,7 @@ static void acpi_processor_hotplug_notify(acpi_handle handle,
break; break;
} }
ej_event->handle = handle; ej_event->device = device;
ej_event->event = ACPI_NOTIFY_EJECT_REQUEST; ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
acpi_os_hotplug_execute(acpi_bus_hot_remove_device, acpi_os_hotplug_execute(acpi_bus_hot_remove_device,
(void *)ej_event); (void *)ej_event);
......
...@@ -116,20 +116,14 @@ static DEVICE_ATTR(modalias, 0444, acpi_device_modalias_show, NULL); ...@@ -116,20 +116,14 @@ static DEVICE_ATTR(modalias, 0444, acpi_device_modalias_show, NULL);
void acpi_bus_hot_remove_device(void *context) void acpi_bus_hot_remove_device(void *context)
{ {
struct acpi_eject_event *ej_event = (struct acpi_eject_event *) context; struct acpi_eject_event *ej_event = (struct acpi_eject_event *) context;
struct acpi_device *device; struct acpi_device *device = ej_event->device;
acpi_handle handle = ej_event->handle; acpi_handle handle = device->handle;
acpi_handle temp; acpi_handle temp;
struct acpi_object_list arg_list; struct acpi_object_list arg_list;
union acpi_object arg; union acpi_object arg;
acpi_status status = AE_OK; acpi_status status = AE_OK;
u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */ u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
if (acpi_bus_get_device(handle, &device))
goto err_out;
if (!device)
goto err_out;
ACPI_DEBUG_PRINT((ACPI_DB_INFO, ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Hot-removing device %s...\n", dev_name(&device->dev))); "Hot-removing device %s...\n", dev_name(&device->dev)));
...@@ -215,7 +209,7 @@ acpi_eject_store(struct device *d, struct device_attribute *attr, ...@@ -215,7 +209,7 @@ acpi_eject_store(struct device *d, struct device_attribute *attr,
goto err; goto err;
} }
ej_event->handle = acpi_device->handle; ej_event->device = acpi_device;
if (acpi_device->flags.eject_pending) { if (acpi_device->flags.eject_pending) {
/* event originated from ACPI eject notification */ /* event originated from ACPI eject notification */
ej_event->event = ACPI_NOTIFY_EJECT_REQUEST; ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
...@@ -223,7 +217,7 @@ acpi_eject_store(struct device *d, struct device_attribute *attr, ...@@ -223,7 +217,7 @@ acpi_eject_store(struct device *d, struct device_attribute *attr,
} else { } else {
/* event originated from user */ /* event originated from user */
ej_event->event = ACPI_OST_EC_OSPM_EJECT; ej_event->event = ACPI_OST_EC_OSPM_EJECT;
(void) acpi_evaluate_hotplug_ost(ej_event->handle, (void) acpi_evaluate_hotplug_ost(acpi_device->handle,
ej_event->event, ACPI_OST_SC_EJECT_IN_PROGRESS, NULL); ej_event->event, ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
} }
......
...@@ -306,7 +306,7 @@ struct acpi_bus_event { ...@@ -306,7 +306,7 @@ struct acpi_bus_event {
}; };
struct acpi_eject_event { struct acpi_eject_event {
acpi_handle handle; struct acpi_device *device;
u32 event; u32 event;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment