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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index 12da54a28a42281ddc0f8abeb3dc1a5d78cf2a5d..51eef87bbc374f85826b16b27141f024aefd9bbe 100644 (file)
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -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();

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 49f3f58f2501ca240034cb65cb3b51d4fdbde7fe..c35e7da1ed7a185fd95d0f0ae7f7b2961d235a0f 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -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;
 
-       ret = create_boost_sysfs_file();
-       if (ret)
-               goto err_null_driver;
+       if (cpufreq_boost_supported()) {
+               ret = create_boost_sysfs_file();
+               if (ret)
+                       goto err_null_driver;
+       }
 
        ret = subsys_interface_register(&cpufreq_interface);
        if (ret)

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index f859b728d98e74e5af96d0aa93b150bd3511da1b..88a4215125bce6be0ac47ef1fda2948eead30c27 100644 (file)
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -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);
 };