tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'acpi-processor'
Merge topic branch depended on by the following material.
+7
-6
+7
-6
drivers/acpi/processor_perflib.c
+7
-6
drivers/acpi/processor_perflib.c
···
63
63
* (e.g. 0 = states 0..n; 1 = states 1..n; etc.
64
64
*/
65
65
status = acpi_evaluate_integer(pr->handle, "_PPC", NULL, &ppc);
66
-
67
-
if (status != AE_NOT_FOUND)
66
+
if (status != AE_NOT_FOUND) {
68
67
acpi_processor_ppc_in_use = true;
69
68
70
-
if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
71
-
acpi_handle_warn(pr->handle, "_PPC evaluation failed: %s\n",
72
-
acpi_format_exception(status));
73
-
return -ENODEV;
69
+
if (ACPI_FAILURE(status)) {
70
+
acpi_handle_warn(pr->handle,
71
+
"_PPC evaluation failed: %s\n",
72
+
acpi_format_exception(status));
73
+
return -ENODEV;
74
+
}
74
75
}
75
76
76
77
pr_debug("CPU %d: _PPC is %d - frequency %s limited\n", pr->id,