Commit f994c1cb authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Rafael J. Wysocki
Browse files

cpufreq: Use str_enable_disable()-like helpers 



Replace ternary (condition ? "enable" : "disable") syntax with helpers
from string_choices.h because:

 1. Simple function call with one argument is easier to read.  Ternary
    operator has three arguments and with wrapping might lead to quite
    long code.
 2. Is slightly shorter thus also easier to read.
 3. It brings uniformity in the text - same string.
 4. Allows deduping by the linker, which results in a smaller binary
    file.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Link: https://patch.msgid.link/20250114190600.846651-1-krzysztof.kozlowski@linaro.org


[ rjw: Subject and changelog edits ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 423124ab

drivers/cpufreq/cpufreq.c

+4 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/mutex.h>

#include <linux/pm_qos.h>

#include <linux/slab.h>

#include <linux/string_choices.h>

#include <linux/suspend.h>

#include <linux/syscore_ops.h>

#include <linux/tick.h>
@@ -602,12 +603,12 @@ static ssize_t store_boost(struct kobject *kobj, struct kobj_attribute *attr, 


	if (cpufreq_boost_trigger_state(enable)) {

		pr_err("%s: Cannot %s BOOST!\n",

		       __func__, enable ? "enable" : "disable");

		       __func__, str_enable_disable(enable));

		return -EINVAL;

	}



	pr_debug("%s: cpufreq BOOST %s\n",

		 __func__, enable ? "enabled" : "disabled");

		 __func__, str_enabled_disabled(enable));



	return count;

}
@@ -2812,7 +2813,7 @@ int cpufreq_boost_trigger_state(int state) 
	write_unlock_irqrestore(&cpufreq_driver_lock, flags);



	pr_err("%s: Cannot %s BOOST\n",

	       __func__, state ? "enable" : "disable");

	       __func__, str_enable_disable(state));



	return ret;

}

drivers/cpufreq/powernv-cpufreq.c

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/of.h>

#include <linux/reboot.h>

#include <linux/slab.h>

#include <linux/string_choices.h>

#include <linux/cpu.h>

#include <linux/hashtable.h>

#include <trace/events/power.h>
@@ -281,7 +282,7 @@ static int init_powernv_pstates(void) 
	pr_info("cpufreq pstate min 0x%x nominal 0x%x max 0x%x\n", pstate_min,

		pstate_nominal, pstate_max);

	pr_info("Workload Optimized Frequency is %s in the platform\n",

		(powernv_pstate_info.wof_enabled) ? "enabled" : "disabled");

		str_enabled_disabled(powernv_pstate_info.wof_enabled));



	pstate_ids = of_get_property(power_mgt, "ibm,pstate-ids", &len_ids);

	if (!pstate_ids) {