Commit 47b577ae authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'powercap' 

Merge a Dynamic Thermal Power Management (DTPM) framework fix for
5.16-rc2.

* powercap:
  powercap: DTPM: Fix suspend failure and kernel warning
parents 08374410 4d1cd144

drivers/powercap/dtpm_cpu.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -166,16 +166,13 @@ static struct dtpm_ops dtpm_ops = { 




static int cpuhp_dtpm_cpu_offline(unsigned int cpu)

static int cpuhp_dtpm_cpu_offline(unsigned int cpu)

{

{

	struct em_perf_domain *pd;

	struct dtpm_cpu *dtpm_cpu;

	struct dtpm_cpu *dtpm_cpu;





	pd = em_cpu_get(cpu);

	if (!pd)

		return -EINVAL;



	dtpm_cpu = per_cpu(dtpm_per_cpu, cpu);

	dtpm_cpu = per_cpu(dtpm_per_cpu, cpu);

	if (dtpm_cpu)

		dtpm_update_power(&dtpm_cpu->dtpm);





	return dtpm_update_power(&dtpm_cpu->dtpm);

	return 0;

}

}





static int cpuhp_dtpm_cpu_online(unsigned int cpu)

static int cpuhp_dtpm_cpu_online(unsigned int cpu)