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>

6 files changed, 9 insertions, 19 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)
         capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PPC_OST_SUPPORT;
 #endif
 
-#ifdef ACPI_HOTPLUG_OST
         capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT;
-#endif
 
         if (!ghes_disable)
                 capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_APEI_SUPPORT;
@@ -410,7 +408,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data)
         return;
 
  err:
-        acpi_evaluate_hotplug_ost(handle, type, ost_code, NULL);
+        acpi_evaluate_ost(handle, type, ost_code, NULL);
 }
 
 /* --------------------------------------------------------------------------
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 3fc530a8d362..f2d8d1c1c391 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -463,8 +463,8 @@ static int acpi_generic_hotplug_event(struct acpi_device *adev, u32 type)
                         dev_info(&adev->dev, "Eject disabled\n");
                         return -EPERM;
                 }
-                acpi_evaluate_hotplug_ost(adev->handle, ACPI_NOTIFY_EJECT_REQUEST,
-                                          ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
+                acpi_evaluate_ost(adev->handle, ACPI_NOTIFY_EJECT_REQUEST,
+                                  ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
                 return acpi_scan_hot_remove(adev);
         }
         return -EINVAL;
@@ -512,7 +512,7 @@ void acpi_device_hotplug(void *data, u32 src)
                 ost_code = ACPI_OST_SC_SUCCESS;
 
  err_out:
-        acpi_evaluate_hotplug_ost(adev->handle, src, ost_code, NULL);
+        acpi_evaluate_ost(adev->handle, src, ost_code, NULL);
 
  out:
         acpi_bus_put_acpi_device(adev);
@@ -572,8 +572,8 @@ acpi_eject_store(struct device *d, struct device_attribute *attr,
                 return count;
 
         put_device(&acpi_device->dev);
-        acpi_evaluate_hotplug_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT,
-                                  ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);
+        acpi_evaluate_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT,
+                          ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL);
         return status == AE_NO_MEMORY ? -ENOMEM : -EAGAIN;
 }
 
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 19d016974080..0f5f78fa6545 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -422,7 +422,7 @@ out:
 EXPORT_SYMBOL(acpi_get_physical_device_location);
 
 /**
- * acpi_evaluate_hotplug_ost: Evaluate _OST for hotplug operations
+ * acpi_evaluate_ost: Evaluate _OST for hotplug operations
  * @handle: ACPI device handle
  * @source_event: source event code
  * @status_code: status code
diff --git a/drivers/xen/xen-acpi-cpuhotplug.c b/drivers/xen/xen-acpi-cpuhotplug.c
index 80875fb770ed..3e62ee4b3b66 100644
--- a/drivers/xen/xen-acpi-cpuhotplug.c
+++ b/drivers/xen/xen-acpi-cpuhotplug.c
@@ -313,7 +313,7 @@ static void acpi_processor_hotplug_notify(acpi_handle handle,
                 goto out;
         }
 
-        (void) acpi_evaluate_hotplug_ost(handle, event, ost_code, NULL);
+        (void) acpi_evaluate_ost(handle, event, ost_code, NULL);
 
 out:
         acpi_scan_lock_release();
diff --git a/drivers/xen/xen-acpi-memhotplug.c b/drivers/xen/xen-acpi-memhotplug.c
index f8d18626969a..34e40b733f9a 100644
--- a/drivers/xen/xen-acpi-memhotplug.c
+++ b/drivers/xen/xen-acpi-memhotplug.c
@@ -285,7 +285,7 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
                 return;
         }
 
-        (void) acpi_evaluate_hotplug_ost(handle, event, ost_code, NULL);
+        (void) acpi_evaluate_ost(handle, event, ost_code, NULL);
         return;
 }
 
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 5225fe06e4ff..4308a9aacc9a 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -51,14 +51,6 @@ acpi_evaluate_reference(acpi_handle handle,
 acpi_status
 acpi_evaluate_ost(acpi_handle handle, u32 source_event, u32 status_code,
                   struct acpi_buffer *status_buf);
-#ifdef ACPI_HOTPLUG_OST
-#define acpi_evaluate_hotplug_ost       acpi_evaluate_ost
-#else
-static inline acpi_status
-acpi_evaluate_hotplug_ost(acpi_handle handle, u32 source_event,
-                        u32 status_code, struct acpi_buffer *status_buf)
-{ return AE_OK; }
-#endif
 
 acpi_status
 acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld);