summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/pci_root.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-07 01:41:39 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-07 01:41:39 +0100
commit5add99cfef416487d32b4b7075fe1a409f3a5e82 (patch)
tree29553178aac29acea786fa36576c8b6e0f536623 /drivers/acpi/pci_root.c
parent2441191a19039002b2c454a261fb45986df15184 (diff)
downloadlinux-5add99cfef416487d32b4b7075fe1a409f3a5e82.tar.gz
linux-5add99cfef416487d32b4b7075fe1a409f3a5e82.tar.bz2
linux-5add99cfef416487d32b4b7075fe1a409f3a5e82.zip
ACPI / hotplug: Simplify device ejection routines
Simplify handle_root_bridge_removal() and acpi_eject_store() by getting rid of struct acpi_eject_event and passing device objects directly to async routines executed via acpi_os_hotplug_execute(). Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Toshi Kani <toshi.kani@hp.com>
Diffstat (limited to 'drivers/acpi/pci_root.c')
-rw-r--r--drivers/acpi/pci_root.c20
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index d7e53ea53d6c..2c03aaee1006 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -593,27 +593,11 @@ static void handle_root_bridge_insertion(acpi_handle handle)
static void handle_root_bridge_removal(struct acpi_device *device)
{
acpi_status status;
- struct acpi_eject_event *ej_event;
-
- ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
- if (!ej_event) {
- /* Inform firmware the hot-remove operation has error */
- (void) acpi_evaluate_hotplug_ost(device->handle,
- ACPI_NOTIFY_EJECT_REQUEST,
- ACPI_OST_SC_NON_SPECIFIC_FAILURE,
- NULL);
- return;
- }
-
- ej_event->device = device;
- ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
get_device(&device->dev);
- status = acpi_os_hotplug_execute(acpi_bus_hot_remove_device, ej_event);
- if (ACPI_FAILURE(status)) {
+ status = acpi_os_hotplug_execute(acpi_bus_hot_remove_device, device);
+ if (ACPI_FAILURE(status))
put_device(&device->dev);
- kfree(ej_event);
- }
}
static void _handle_hotplug_event_root(struct work_struct *work)