Commit 404c9121 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'powercap' 

Merge DTPM fixes for 5.16-rc4.

* powercap:
  powercap: DTPM: Drop unused local variable from init_dtpm()
  powercap/drivers/dtpm: Disable DTPM at boot time
parents a15b8cd7 1ac5e21d

drivers/powercap/dtpm.c

+0 −5
Original line number Diff line number Diff line
@@ -463,17 +463,12 @@ int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent) 


static int __init init_dtpm(void)

{

	struct dtpm_descr *dtpm_descr;



	pct = powercap_register_control_type(NULL, "dtpm", NULL);

	if (IS_ERR(pct)) {

		pr_err("Failed to register control type\n");

		return PTR_ERR(pct);

	}



	for_each_dtpm_table(dtpm_descr)

		dtpm_descr->init();



	return 0;

}

late_initcall(init_dtpm);