1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index b587ec8257b2..fbcfaa682c15 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -255,7 +255,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
                         acpi_print_osc_error(handle, context,
                                 "_OSC invalid revision");
                 if (errors & OSC_CAPABILITIES_MASK_ERROR) {
-                        if (((u32 *)context->cap.pointer)[OSC_QUERY_TYPE]
+                        if (((u32 *)context->cap.pointer)[OSC_QUERY_DWORD]
                             & OSC_QUERY_ENABLE)
                                 goto out_success;
                         status = AE_SUPPORT;
@@ -295,30 +295,30 @@ static void acpi_bus_osc_support(void)
         };
         acpi_handle handle;
 
-        capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
-        capbuf[OSC_SUPPORT_TYPE] = OSC_SB_PR3_SUPPORT; /* _PR3 is in use */
+        capbuf[OSC_QUERY_DWORD] = OSC_QUERY_ENABLE;
+        capbuf[OSC_SUPPORT_DWORD] = OSC_SB_PR3_SUPPORT; /* _PR3 is in use */
 #if defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) ||\
                         defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE)
-        capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PAD_SUPPORT;
+        capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PAD_SUPPORT;
 #endif
 
 #if defined(CONFIG_ACPI_PROCESSOR) || defined(CONFIG_ACPI_PROCESSOR_MODULE)
-        capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PPC_OST_SUPPORT;
+        capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PPC_OST_SUPPORT;
 #endif
 
 #ifdef ACPI_HOTPLUG_OST
-        capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_HOTPLUG_OST_SUPPORT;
+        capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT;
 #endif
 
         if (!ghes_disable)
-                capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_APEI_SUPPORT;
+                capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_APEI_SUPPORT;
         if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))
                 return;
         if (ACPI_SUCCESS(acpi_run_osc(handle, &context))) {
                 u32 *capbuf_ret = context.ret.pointer;
-                if (context.ret.length > OSC_SUPPORT_TYPE)
+                if (context.ret.length > OSC_SUPPORT_DWORD)
                         osc_sb_apei_support_acked =
-                                capbuf_ret[OSC_SUPPORT_TYPE] & OSC_SB_APEI_SUPPORT;
+                                capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_APEI_SUPPORT;
                 kfree(context.ret.pointer);
         }
         /* do we need to check other returned cap? Sounds no */