diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-08-03 13:12:29 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-08-03 13:12:29 +0200 |
| commit | 2d5c80bcf86466d1f0b640b28aca44c691328160 (patch) | |
| tree | 057d524ff2888ae33c7106b4d7268f15b7b4db87 /drivers/acpi | |
| parent | 5b5642075c317e67ea342a2fb8023a8e754a5002 (diff) | |
| parent | 0a398945d6f3e54f9f88ba2a17908674c659bfa4 (diff) | |
Merge branch 'pm-cpuidle'
* pm-cpuidle:
cpuidle: ACPI: fix 'return' with no value build warning
intel_idle: Customize IceLake server support
cpuidle: change enter_s2idle() prototype
cpuidle: psci: Prevent domain idlestates until consumers are ready
cpuidle: psci: Convert PM domain to platform driver
cpuidle: psci: Fix error path via converting to a platform driver
cpuidle: psci: Fail cpuidle registration if set OSI mode failed
cpuidle: psci: Split into two separate build objects
intel_idle: Eliminate redundant static variable
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 75534c5b5433..0c65a09aec1b 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -655,8 +655,8 @@ static int acpi_idle_enter(struct cpuidle_device *dev, return index; } -static void acpi_idle_enter_s2idle(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int index) +static int acpi_idle_enter_s2idle(struct cpuidle_device *dev, + struct cpuidle_driver *drv, int index) { struct acpi_processor_cx *cx = per_cpu(acpi_cstate[index], dev->cpu); @@ -664,16 +664,18 @@ static void acpi_idle_enter_s2idle(struct cpuidle_device *dev, struct acpi_processor *pr = __this_cpu_read(processors); if (unlikely(!pr)) - return; + return 0; if (pr->flags.bm_check) { acpi_idle_enter_bm(pr, cx, false); - return; + return 0; } else { ACPI_FLUSH_CPU_CACHE(); } } acpi_idle_do_entry(cx); + + return 0; } static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr, |