summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-12-03 20:09:32 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-12-03 20:09:32 +0300
commit404c91218703d58c8f442aa01e4ae558f14c0e20 (patch)
treecd7987ec7ca9c9dc470492bbd2f9391b030abd73 /drivers
parenta15b8cd77512fd24920f3a6fe1c85f896fb775e8 (diff)
parent1ac5e21d43b2325854cf3b36b1509b28468dc6fd (diff)
downloadlinux-404c91218703d58c8f442aa01e4ae558f14c0e20.tar.xz
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/powercap/dtpm.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/powercap/dtpm.c b/drivers/powercap/dtpm.c
index b9fac786246a..2a5c1829aab7 100644
--- a/drivers/powercap/dtpm.c
+++ b/drivers/powercap/dtpm.c
@@ -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);