44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
|
From 7305364888151cb9e6b435c5f219ccfd18132b58 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
|
||
|
|
Date: Thu, 17 Oct 2024 10:05:33 +0000
|
||
|
|
Subject: cpufreq/amd-pstate: Remove the redundant amd_pstate_set_driver() call
|
||
|
|
|
||
|
|
amd_pstate_set_driver() is called twice, once in amd_pstate_init() and once
|
||
|
|
as part of amd_pstate_register_driver(). Move around code and eliminate
|
||
|
|
the redundancy.
|
||
|
|
|
||
|
|
Signed-off-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
|
||
|
|
---
|
||
|
|
drivers/cpufreq/amd-pstate.c | 12 ++++--------
|
||
|
|
1 file changed, 4 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/cpufreq/amd-pstate.c
|
||
|
|
+++ b/drivers/cpufreq/amd-pstate.c
|
||
|
|
@@ -1878,9 +1878,11 @@ static int __init amd_pstate_init(void)
|
||
|
|
return -ENODEV;
|
||
|
|
}
|
||
|
|
|
||
|
|
- ret = amd_pstate_set_driver(cppc_state);
|
||
|
|
- if (ret)
|
||
|
|
+ ret = amd_pstate_register_driver(cppc_state);
|
||
|
|
+ if (ret) {
|
||
|
|
+ pr_err("failed to register with return %d\n", ret);
|
||
|
|
return ret;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
/* capability check */
|
||
|
|
if (cpu_feature_enabled(X86_FEATURE_CPPC)) {
|
||
|
|
@@ -1900,12 +1902,6 @@ static int __init amd_pstate_init(void)
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
|
||
|
|
- ret = amd_pstate_register_driver(cppc_state);
|
||
|
|
- if (ret) {
|
||
|
|
- pr_err("failed to register with return %d\n", ret);
|
||
|
|
- return ret;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
dev_root = bus_get_dev_root(&cpu_subsys);
|
||
|
|
if (dev_root) {
|
||
|
|
ret = sysfs_create_group(&dev_root->kobj, &amd_pstate_global_attr_group);
|