Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a6c79f2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

cpufreq: Simplify core code related to boost support 



Notice that the boost_supported field in struct cpufreq_driver is
redundant, because the driver's ->set_boost callback may be left
unset if "boost" is not supported.  Moreover, the only driver
populating the ->set_boost callback is acpi_cpufreq, so make it
avoid populating that callback if "boost" is not supported, rework
the core to check ->set_boost instead of boost_supported to
verify "boost" support and drop boost_supported which isn't
used any more.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 17135782

drivers/cpufreq/acpi-cpufreq.c

+2 −3
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static ssize_t store_cpb(struct cpufreq_policy *policy, const char *buf, 
	int ret;

	unsigned int val = 0;



	if (!acpi_cpufreq_driver.boost_supported)

	if (!acpi_cpufreq_driver.set_boost)

		return -EINVAL;



	ret = kstrtouint(buf, 10, &val);
@@ -900,7 +900,6 @@ static struct cpufreq_driver acpi_cpufreq_driver = { 
	.resume		= acpi_cpufreq_resume,

	.name		= "acpi-cpufreq",

	.attr		= acpi_cpufreq_attr,

	.set_boost      = set_boost,

};



static void __init acpi_cpufreq_boost_init(void)
@@ -911,7 +910,7 @@ static void __init acpi_cpufreq_boost_init(void) 
		if (!msrs)

			return;



		acpi_cpufreq_driver.boost_supported = true;

		acpi_cpufreq_driver.set_boost = set_boost;

		acpi_cpufreq_driver.boost_enabled = boost_state(0);



		cpu_notifier_register_begin();

drivers/cpufreq/cpufreq.c

+7 −15
Original line number Diff line number Diff line
@@ -2332,23 +2332,13 @@ int cpufreq_boost_trigger_state(int state) 


static bool cpufreq_boost_supported(void)

{

	return likely(cpufreq_driver) && cpufreq_driver->boost_supported;

	return likely(cpufreq_driver) && cpufreq_driver->set_boost;

}



static int create_boost_sysfs_file(void)

{

	int ret;



	if (!cpufreq_boost_supported())

		return 0;



	/*

	 * Check if driver provides function to enable boost -

	 * if not, use cpufreq_boost_set_sw as default

	 */

	if (!cpufreq_driver->set_boost)

		cpufreq_driver->set_boost = cpufreq_boost_set_sw;



	ret = sysfs_create_file(cpufreq_global_kobject, &boost.attr);

	if (ret)

		pr_err("%s: cannot register global BOOST sysfs file\n",
@@ -2371,7 +2361,7 @@ int cpufreq_enable_boost_support(void) 
	if (cpufreq_boost_supported())

		return 0;



	cpufreq_driver->boost_supported = true;

	cpufreq_driver->set_boost = cpufreq_boost_set_sw;



	/* This will get removed on driver unregister */

	return create_boost_sysfs_file();
@@ -2431,9 +2421,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data) 
	if (driver_data->setpolicy)

		driver_data->flags |= CPUFREQ_CONST_LOOPS;



	if (cpufreq_boost_supported()) {

		ret = create_boost_sysfs_file();

		if (ret)

			goto err_null_driver;

	}



	ret = subsys_interface_register(&cpufreq_interface);

	if (ret)

include/linux/cpufreq.h

+0 −1
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ struct cpufreq_driver { 
	struct freq_attr **attr;



	/* platform specific boost support code */

	bool		boost_supported;

	bool		boost_enabled;

	int		(*set_boost)(int state);

};