Skip to content

Commit 404c912

Browse files
committed
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
2 parents a15b8cd + 1ac5e21 commit 404c912

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

drivers/powercap/dtpm.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -463,17 +463,12 @@ int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent)
463463

464464
static int __init init_dtpm(void)
465465
{
466-
struct dtpm_descr *dtpm_descr;
467-
468466
pct = powercap_register_control_type(NULL, "dtpm", NULL);
469467
if (IS_ERR(pct)) {
470468
pr_err("Failed to register control type\n");
471469
return PTR_ERR(pct);
472470
}
473471

474-
for_each_dtpm_table(dtpm_descr)
475-
dtpm_descr->init();
476-
477472
return 0;
478473
}
479474
late_initcall(init_dtpm);

0 commit comments

Comments
 (0)