3 files changed, 19 insertions, 19 deletions

diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index 46f80e2c92f7..6d2c49b86b7f 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -758,9 +758,9 @@ int apei_osc_setup(void)
                 .cap.pointer    = capbuf,
         };
 
-        capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
-        capbuf[OSC_SUPPORT_TYPE] = 1;
-        capbuf[OSC_CONTROL_TYPE] = 0;
+        capbuf[OSC_QUERY_DWORD] = OSC_QUERY_ENABLE;
+        capbuf[OSC_SUPPORT_DWORD] = 1;
+        capbuf[OSC_CONTROL_DWORD] = 0;
 
         if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle))
             || ACPI_FAILURE(acpi_run_osc(handle, &context)))
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 */
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index d3874f425653..323afd7ccfbf 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -158,14 +158,14 @@ static acpi_status acpi_pci_query_osc(struct acpi_pci_root *root,
         support &= OSC_PCI_SUPPORT_MASKS;
         support |= root->osc_support_set;
 
-        capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
-        capbuf[OSC_SUPPORT_TYPE] = support;
+        capbuf[OSC_QUERY_DWORD] = OSC_QUERY_ENABLE;
+        capbuf[OSC_SUPPORT_DWORD] = support;
         if (control) {
                 *control &= OSC_PCI_CONTROL_MASKS;
-                capbuf[OSC_CONTROL_TYPE] = *control | root->osc_control_set;
+                capbuf[OSC_CONTROL_DWORD] = *control | root->osc_control_set;
         } else {
                 /* Run _OSC query only with existing controls. */
-                capbuf[OSC_CONTROL_TYPE] = root->osc_control_set;
+                capbuf[OSC_CONTROL_DWORD] = root->osc_control_set;
         }
 
         status = acpi_pci_run_osc(root->device->handle, capbuf, &result);
@@ -357,9 +357,9 @@ acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask, u32 req)
                 goto out;
         }
 
-        capbuf[OSC_QUERY_TYPE] = 0;
-        capbuf[OSC_SUPPORT_TYPE] = root->osc_support_set;
-        capbuf[OSC_CONTROL_TYPE] = ctrl;
+        capbuf[OSC_QUERY_DWORD] = 0;
+        capbuf[OSC_SUPPORT_DWORD] = root->osc_support_set;
+        capbuf[OSC_CONTROL_DWORD] = ctrl;
         status = acpi_pci_run_osc(handle, capbuf, mask);
         if (ACPI_SUCCESS(status))
                 root->osc_control_set = *mask;