Skip to content

Commit

Permalink
Merge branch 'powercap'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Rafael J. Wysocki committed Dec 3, 2021
2 parents a15b8cd + 1ac5e21 commit 404c912
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions drivers/powercap/dtpm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

0 comments on commit 404c912

Please sign in to comment.