diff options
| author | Perry Yuan <[email protected]> | 2022-08-14 16:35:48 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2022-08-25 11:55:17 +0000 |
| commit | a2a9d1850060e5d995136561d76e81d61414f076 (patch) | |
| tree | 673e97afcb75551e6285adda9855c39cd078b81b /drivers/cpufreq/cppc_cpufreq.c | |
| parent | Linux 6.0-rc2 (diff) | |
| download | kernel-a2a9d1850060e5d995136561d76e81d61414f076.tar.gz kernel-a2a9d1850060e5d995136561d76e81d61414f076.zip | |
ACPI: CPPC: Add ACPI disabled check to acpi_cpc_valid()
Make acpi_cpc_valid() check if ACPI is disabled, so that its callers
don't need to check that separately. This will also cause the AMD
pstate driver to refuse to load right away when ACPI is disabled.
Also update the warning message in amd_pstate_init() to mention the
ACPI disabled case for completeness.
Signed-off-by: Perry Yuan <[email protected]>
[ rjw: Subject edits, new changelog ]
Signed-off-by: Rafael J. Wysocki <[email protected]>
Diffstat (limited to 'drivers/cpufreq/cppc_cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/cppc_cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c index 24eaf0ec344d..9adb7612993e 100644 --- a/drivers/cpufreq/cppc_cpufreq.c +++ b/drivers/cpufreq/cppc_cpufreq.c @@ -947,7 +947,7 @@ static int __init cppc_cpufreq_init(void) { int ret; - if ((acpi_disabled) || !acpi_cpc_valid()) + if (!acpi_cpc_valid()) return -ENODEV; cppc_check_hisi_workaround(); |