diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-20 19:07:17 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-21 18:50:49 -0500 |
commit | 700b8422fb9e6041907bda45a15f4e2ab0438a04 (patch) | |
tree | 148a28315ec01ac69254b368081f4a9d0588b50e /drivers/acpi/bus.c | |
parent | 2bd74d91b1217d84d08db57b860d056d130248d3 (diff) |
ACPI: Drop acpi_evaluate_hotplug_ost() and ACPI_HOTPLUG_OST
Replace acpi_evaluate_hotplug_ost() with acpi_evaluate_ost()
everywhere and drop the ACPI_HOTPLUG_OST symbol so that hotplug
_OST is supported unconditionally.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Diffstat (limited to 'drivers/acpi/bus.c')
-rw-r--r-- | drivers/acpi/bus.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index e61e7b8a2eaf..4cefb98f274d 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
@@ -311,9 +311,7 @@ static void acpi_bus_osc_support(void) | |||
311 | capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PPC_OST_SUPPORT; | 311 | capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PPC_OST_SUPPORT; |
312 | #endif | 312 | #endif |
313 | 313 | ||
314 | #ifdef ACPI_HOTPLUG_OST | ||
315 | capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT; | 314 | capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT; |
316 | #endif | ||
317 | 315 | ||
318 | if (!ghes_disable) | 316 | if (!ghes_disable) |
319 | capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_APEI_SUPPORT; | 317 | capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_APEI_SUPPORT; |
@@ -410,7 +408,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data) | |||
410 | return; | 408 | return; |
411 | 409 | ||
412 | err: | 410 | err: |
413 | acpi_evaluate_hotplug_ost(handle, type, ost_code, NULL); | 411 | acpi_evaluate_ost(handle, type, ost_code, NULL); |
414 | } | 412 | } |
415 | 413 | ||
416 | /* -------------------------------------------------------------------------- | 414 | /* -------------------------------------------------------------------------- |