Skip to contentSkip to conversation

cpufreq: Remove cpufreq_driver check in cpufreq_boost_supported()

PATCH In review Yue Hu 3 participants 3 messages Apr 9, 2019 – May 1, 2019 CPU frequency scaling framework

lore
Share & tools
lore

Yue Hu

author
#0 lore raw

PATCH 1/1 cpufreq: Remove cpufreq_driver check in cpufreq_boost_supported()

From: Yue Hu <[email protected]>

Currently there are three calling paths for cpufreq_boost_supported() in all as below, we can see the cpufreq_driver null check is needless since it is already checked before.

<path1>
cpufreq_enable_boost_support()

    |-> if (!cpufreq_driver)
    |-> cpufreq_boost_supported()

<path2>
cpufreq_register_driver()

    |-> if (!driver_data ...
    |-> cpufreq_driver = driver_data
    |-> cpufreq_boost_supported()
    |-> remove_boost_sysfs_file()
          |-> cpufreq_boost_supported()

<path3>
cpufreq_unregister_driver()

    |-> if (!cpufreq_driver ...
    |-> remove_boost_sysfs_file()
          |-> cpufreq_boost_supported()
---
 drivers/cpufreq/cpufreq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/cpufreq.c +1 -1
index e109227..d9123de 100644
@@ -2426,7 +2426,7 @@ int cpufreq_boost_trigger_state(int state)
 
 static bool cpufreq_boost_supported(void)
 {
-	return likely(cpufreq_driver) && cpufreq_driver->set_boost;
+	return cpufreq_driver->set_boost;
 }
 
 static int create_boost_sysfs_file(void)
Signature · 1 line
1.9.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 35 lines · Yue Hu

From: Yue Hu <[email protected]>

Currently there are three calling paths for cpufreq_boost_supported() in all as below, we can see the cpufreq_driver null check is needless since it is already checked before.

<path1>
cpufreq_enable_boost_support()

    |-> if (!cpufreq_driver)
    |-> cpufreq_boost_supported()

<path2>
cpufreq_register_driver()

    |-> if (!driver_data ...
    |-> cpufreq_driver = driver_data
    |-> cpufreq_boost_supported()
    |-> remove_boost_sysfs_file()
          |-> cpufreq_boost_supported()

<path3>
cpufreq_unregister_driver()

    |-> if (!cpufreq_driver ...
    |-> remove_boost_sysfs_file()
          |-> cpufreq_boost_supported()
---
 drivers/cpufreq/cpufreq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/cpufreq.c +0 -0
index e109227..d9123de 100644

drivers/cpufreq/cpufreq.c int cpufreq_boost_trigger_state(int state) · line 2432

Quoted 8 lines
drivers/cpufreq/cpufreq.c +1 -1
@@ -2426,7 +2426,7 @@ int cpufreq_boost_trigger_state(int state)
 
 static bool cpufreq_boost_supported(void)
 {
-	return likely(cpufreq_driver) && cpufreq_driver->set_boost;
+	return cpufreq_driver->set_boost;
 }
 
 static int create_boost_sysfs_file(void)
Signature · 1 line
viresh
#2 lore raw
Quoted 43 lines · CEST Viresh Kumar
Quoted 42 lines · Yue Hu

From: Yue Hu <[email protected]>

Currently there are three calling paths for cpufreq_boost_supported() in all as below, we can see the cpufreq_driver null check is needless since it is already checked before.

<path1>
cpufreq_enable_boost_support()

    |-> if (!cpufreq_driver)
    |-> cpufreq_boost_supported()

<path2>
cpufreq_register_driver()

    |-> if (!driver_data ...
    |-> cpufreq_driver = driver_data
    |-> cpufreq_boost_supported()
    |-> remove_boost_sysfs_file()
          |-> cpufreq_boost_supported()

<path3>
cpufreq_unregister_driver()

    |-> if (!cpufreq_driver ...
    |-> remove_boost_sysfs_file()
          |-> cpufreq_boost_supported()
---
 drivers/cpufreq/cpufreq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/cpufreq.c +1 -1
index e109227..d9123de 100644
@@ -2426,7 +2426,7 @@ int cpufreq_boost_trigger_state(int state)
 
 static bool cpufreq_boost_supported(void)
 {
-	return likely(cpufreq_driver) && cpufreq_driver->set_boost;
+	return cpufreq_driver->set_boost;
 }
 
Quoted 3 lines

drivers/cpufreq/cpufreq.c int cpufreq_boost_trigger_state(int state) · line 2432

Quoted 1 line
drivers/cpufreq/cpufreq.c +0 -0
 static int create_boost_sysfs_file(void)

Patch applied, thanks!