aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-09-05 17:05:54 -0400
committerBjorn Helgaas <bhelgaas@google.com>2013-09-23 19:40:45 -0400
commitb938a229c85a567de7dba2d806d9f63a7c90483e (patch)
treead5f61296d196d5539f3fbda526a92dd085104c9 /drivers/acpi
parentdedf1e4dfd5477b4315ad451b4be0ff8d9f7e85f (diff)
ACPI: Rename OSC_QUERY_TYPE to OSC_QUERY_DWORD
OSC_QUERY_TYPE isn't a "type"; it's an index into the _OSC Capabilities Buffer of DWORDs. Rename OSC_QUERY_TYPE, OSC_SUPPORT_TYPE, and OSC_CONTROL_TYPE to OSC_QUERY_DWORD, etc., to make this clear. No functional change. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/apei/apei-base.c6
-rw-r--r--drivers/acpi/bus.c18
-rw-r--r--drivers/acpi/pci_root.c14
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)
758 .cap.pointer = capbuf, 758 .cap.pointer = capbuf,
759 }; 759 };
760 760
761 capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE; 761 capbuf[OSC_QUERY_DWORD] = OSC_QUERY_ENABLE;
762 capbuf[OSC_SUPPORT_TYPE] = 1; 762 capbuf[OSC_SUPPORT_DWORD] = 1;
763 capbuf[OSC_CONTROL_TYPE] = 0; 763 capbuf[OSC_CONTROL_DWORD] = 0;
764 764
765 if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)) 765 if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle))
766 || ACPI_FAILURE(acpi_run_osc(handle, &context))) 766 || 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)
255 acpi_print_osc_error(handle, context, 255 acpi_print_osc_error(handle, context,
256 "_OSC invalid revision"); 256 "_OSC invalid revision");
257 if (errors & OSC_CAPABILITIES_MASK_ERROR) { 257 if (errors & OSC_CAPABILITIES_MASK_ERROR) {
258 if (((u32 *)context->cap.pointer)[OSC_QUERY_TYPE] 258 if (((u32 *)context->cap.pointer)[OSC_QUERY_DWORD]
259 & OSC_QUERY_ENABLE) 259 & OSC_QUERY_ENABLE)
260 goto out_success; 260 goto out_success;
261 status = AE_SUPPORT; 261 status = AE_SUPPORT;
@@ -295,30 +295,30 @@ static void acpi_bus_osc_support(void)
295 }; 295 };
296 acpi_handle handle; 296 acpi_handle handle;
297 297
298 capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE; 298 capbuf[OSC_QUERY_DWORD] = OSC_QUERY_ENABLE;
299 capbuf[OSC_SUPPORT_TYPE] = OSC_SB_PR3_SUPPORT; /* _PR3 is in use */ 299 capbuf[OSC_SUPPORT_DWORD] = OSC_SB_PR3_SUPPORT; /* _PR3 is in use */
300#if defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) ||\ 300#if defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) ||\
301 defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE) 301 defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE)
302 capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PAD_SUPPORT; 302 capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PAD_SUPPORT;
303#endif 303#endif
304 304
305#if defined(CONFIG_ACPI_PROCESSOR) || defined(CONFIG_ACPI_PROCESSOR_MODULE) 305#if defined(CONFIG_ACPI_PROCESSOR) || defined(CONFIG_ACPI_PROCESSOR_MODULE)
306 capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PPC_OST_SUPPORT; 306 capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PPC_OST_SUPPORT;
307#endif 307#endif
308 308
309#ifdef ACPI_HOTPLUG_OST 309#ifdef ACPI_HOTPLUG_OST
310 capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_HOTPLUG_OST_SUPPORT; 310 capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT;
311#endif 311#endif
312 312
313 if (!ghes_disable) 313 if (!ghes_disable)
314 capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_APEI_SUPPORT; 314 capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_APEI_SUPPORT;
315 if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle))) 315 if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))
316 return; 316 return;
317 if (ACPI_SUCCESS(acpi_run_osc(handle, &context))) { 317 if (ACPI_SUCCESS(acpi_run_osc(handle, &context))) {
318 u32 *capbuf_ret = context.ret.pointer; 318 u32 *capbuf_ret = context.ret.pointer;
319 if (context.ret.length > OSC_SUPPORT_TYPE) 319 if (context.ret.length > OSC_SUPPORT_DWORD)
320 osc_sb_apei_support_acked = 320 osc_sb_apei_support_acked =
321 capbuf_ret[OSC_SUPPORT_TYPE] & OSC_SB_APEI_SUPPORT; 321 capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_APEI_SUPPORT;
322 kfree(context.ret.pointer); 322 kfree(context.ret.pointer);
323 } 323 }
324 /* do we need to check other returned cap? Sounds no */ 324 /* 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,
158 support &= OSC_PCI_SUPPORT_MASKS; 158 support &= OSC_PCI_SUPPORT_MASKS;
159 support |= root->osc_support_set; 159 support |= root->osc_support_set;
160 160
161 capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE; 161 capbuf[OSC_QUERY_DWORD] = OSC_QUERY_ENABLE;
162 capbuf[OSC_SUPPORT_TYPE] = support; 162 capbuf[OSC_SUPPORT_DWORD] = support;
163 if (control) { 163 if (control) {
164 *control &= OSC_PCI_CONTROL_MASKS; 164 *control &= OSC_PCI_CONTROL_MASKS;
165 capbuf[OSC_CONTROL_TYPE] = *control | root->osc_control_set; 165 capbuf[OSC_CONTROL_DWORD] = *control | root->osc_control_set;
166 } else { 166 } else {
167 /* Run _OSC query only with existing controls. */ 167 /* Run _OSC query only with existing controls. */
168 capbuf[OSC_CONTROL_TYPE] = root->osc_control_set; 168 capbuf[OSC_CONTROL_DWORD] = root->osc_control_set;
169 } 169 }
170 170
171 status = acpi_pci_run_osc(root->device->handle, capbuf, &result); 171 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)
357 goto out; 357 goto out;
358 } 358 }
359 359
360 capbuf[OSC_QUERY_TYPE] = 0; 360 capbuf[OSC_QUERY_DWORD] = 0;
361 capbuf[OSC_SUPPORT_TYPE] = root->osc_support_set; 361 capbuf[OSC_SUPPORT_DWORD] = root->osc_support_set;
362 capbuf[OSC_CONTROL_TYPE] = ctrl; 362 capbuf[OSC_CONTROL_DWORD] = ctrl;
363 status = acpi_pci_run_osc(handle, capbuf, mask); 363 status = acpi_pci_run_osc(handle, capbuf, mask);
364 if (ACPI_SUCCESS(status)) 364 if (ACPI_SUCCESS(status))
365 root->osc_control_set = *mask; 365 root->osc_control_set = *mask;