ACPI: platform_profile: Add `probe` to platform_profile_ops

Add a `probe` callback to platform_profile_ops, which lets drivers
initialize the choices member manually. This is a step towards
unexposing the struct platform_profile_handler from the consumer
drivers.

Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Kurt Borja <kuurtb@gmail.com>
Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
Tested-by: Mark Pearson <mpearson-lenovo@squebb.ca>
Link: https://lore.kernel.org/r/20250116002721.75592-6-kuurtb@gmail.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/acpi/platform_profile.c b/drivers/acpi/platform_profile.c
index 161a05d57b0f894fdbeeac1a79436826e817ff96..120f8402facd953e2b4a3c4bccc5852c189b98ce 100644 (file)
--- a/drivers/acpi/platform_profile.c
+++ b/drivers/acpi/platform_profile.c
@@ -465,12 +465,23 @@ int platform_profile_register(struct platform_profile_handler *pprof, void *drvd
        int err;
 
        /* Sanity check the profile handler */
-       if (!pprof || bitmap_empty(pprof->choices, PLATFORM_PROFILE_LAST) ||
-           !pprof->ops->profile_set || !pprof->ops->profile_get) {
+       if (!pprof || !pprof->ops->profile_set || !pprof->ops->profile_get ||
+           !pprof->ops->probe) {
                pr_err("platform_profile: handler is invalid\n");
                return -EINVAL;
        }
 
+       err = pprof->ops->probe(drvdata, pprof->choices);
+       if (err) {
+               dev_err(pprof->dev, "platform_profile probe failed\n");
+               return err;
+       }
+
+       if (bitmap_empty(pprof->choices, PLATFORM_PROFILE_LAST)) {
+               dev_err(pprof->dev, "Failed to register a platform_profile class device with empty choices\n");
+               return -EINVAL;
+       }
+
        guard(mutex)(&profile_lock);
 
        /* create class interface for individual handler */

diff --git a/drivers/platform/surface/surface_platform_profile.c b/drivers/platform/surface/surface_platform_profile.c
index 76967bfeeef8643fcbecd201c2de51d3c4ed960f..48cfe9cb89c803f22b22503e60c7418709b0809a 100644 (file)
--- a/drivers/platform/surface/surface_platform_profile.c
+++ b/drivers/platform/surface/surface_platform_profile.c
@@ -201,7 +201,18 @@ static int ssam_platform_profile_set(struct device *dev,
        return tp;
 }
 
+static int ssam_platform_profile_probe(void *drvdata, unsigned long *choices)
+{
+       set_bit(PLATFORM_PROFILE_LOW_POWER, choices);
+       set_bit(PLATFORM_PROFILE_BALANCED, choices);
+       set_bit(PLATFORM_PROFILE_BALANCED_PERFORMANCE, choices);
+       set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
+
+       return 0;
+}
+
 static const struct platform_profile_ops ssam_platform_profile_ops = {
+       .probe = ssam_platform_profile_probe,
        .profile_get = ssam_platform_profile_get,
        .profile_set = ssam_platform_profile_set,
 };
@@ -223,11 +234,6 @@ static int surface_platform_profile_probe(struct ssam_device *sdev)
 
        tpd->has_fan = device_property_read_bool(&sdev->dev, "has_fan");
 
-       set_bit(PLATFORM_PROFILE_LOW_POWER, tpd->handler.choices);
-       set_bit(PLATFORM_PROFILE_BALANCED, tpd->handler.choices);
-       set_bit(PLATFORM_PROFILE_BALANCED_PERFORMANCE, tpd->handler.choices);
-       set_bit(PLATFORM_PROFILE_PERFORMANCE, tpd->handler.choices);
-
        return platform_profile_register(&tpd->handler, tpd);
 }
 

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 63e6bd1fe339ce893ea6099d71688cf74206bdb2..4d62a61cb241cb7ed6c99605970ba2b41f56a7d4 100644 (file)
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -2019,7 +2019,53 @@ acer_predator_v4_platform_profile_set(struct device *dev,
        return 0;
 }
 
+static int
+acer_predator_v4_platform_profile_probe(void *drvdata, unsigned long *choices)
+{
+       unsigned long supported_profiles;
+       int err;
+
+       err = WMID_gaming_get_misc_setting(ACER_WMID_MISC_SETTING_SUPPORTED_PROFILES,
+                                          (u8 *)&supported_profiles);
+       if (err)
+               return err;
+
+       /* Iterate through supported profiles in order of increasing performance */
+       if (test_bit(ACER_PREDATOR_V4_THERMAL_PROFILE_ECO, &supported_profiles)) {
+               set_bit(PLATFORM_PROFILE_LOW_POWER, choices);
+               acer_predator_v4_max_perf =
+                       ACER_PREDATOR_V4_THERMAL_PROFILE_ECO;
+       }
+
+       if (test_bit(ACER_PREDATOR_V4_THERMAL_PROFILE_QUIET, &supported_profiles)) {
+               set_bit(PLATFORM_PROFILE_QUIET, choices);
+               acer_predator_v4_max_perf =
+                       ACER_PREDATOR_V4_THERMAL_PROFILE_QUIET;
+       }
+
+       if (test_bit(ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED, &supported_profiles)) {
+               set_bit(PLATFORM_PROFILE_BALANCED, choices);
+               acer_predator_v4_max_perf =
+                       ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED;
+       }
+
+       if (test_bit(ACER_PREDATOR_V4_THERMAL_PROFILE_PERFORMANCE, &supported_profiles)) {
+               set_bit(PLATFORM_PROFILE_BALANCED_PERFORMANCE, choices);
+               acer_predator_v4_max_perf =
+                       ACER_PREDATOR_V4_THERMAL_PROFILE_PERFORMANCE;
+       }
+
+       if (test_bit(ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO, &supported_profiles)) {
+               set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
+               acer_predator_v4_max_perf =
+                       ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO;
+       }
+
+       return 0;
+}
+
 static const struct platform_profile_ops acer_predator_v4_platform_profile_ops = {
+       .probe = acer_predator_v4_platform_profile_probe,
        .profile_get = acer_predator_v4_platform_profile_get,
        .profile_set = acer_predator_v4_platform_profile_set,
 };
@@ -2027,7 +2073,6 @@ static const struct platform_profile_ops acer_predator_v4_platform_profile_ops =
 static int acer_platform_profile_setup(struct platform_device *device)
 {
        if (quirks->predator_v4) {
-               unsigned long supported_profiles;
                int err;
 
                platform_profile_handler.name = "acer-wmi";
@@ -2035,47 +2080,6 @@ static int acer_platform_profile_setup(struct platform_device *device)
                platform_profile_handler.ops =
                        &acer_predator_v4_platform_profile_ops;
 
-               err = WMID_gaming_get_misc_setting(ACER_WMID_MISC_SETTING_SUPPORTED_PROFILES,
-                                                  (u8 *)&supported_profiles);
-               if (err)
-                       return err;
-
-               /* Iterate through supported profiles in order of increasing performance */
-               if (test_bit(ACER_PREDATOR_V4_THERMAL_PROFILE_ECO, &supported_profiles)) {
-                       set_bit(PLATFORM_PROFILE_LOW_POWER,
-                               platform_profile_handler.choices);
-                       acer_predator_v4_max_perf =
-                               ACER_PREDATOR_V4_THERMAL_PROFILE_ECO;
-               }
-
-               if (test_bit(ACER_PREDATOR_V4_THERMAL_PROFILE_QUIET, &supported_profiles)) {
-                       set_bit(PLATFORM_PROFILE_QUIET,
-                               platform_profile_handler.choices);
-                       acer_predator_v4_max_perf =
-                               ACER_PREDATOR_V4_THERMAL_PROFILE_QUIET;
-               }
-
-               if (test_bit(ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED, &supported_profiles)) {
-                       set_bit(PLATFORM_PROFILE_BALANCED,
-                               platform_profile_handler.choices);
-                       acer_predator_v4_max_perf =
-                               ACER_PREDATOR_V4_THERMAL_PROFILE_BALANCED;
-               }
-
-               if (test_bit(ACER_PREDATOR_V4_THERMAL_PROFILE_PERFORMANCE, &supported_profiles)) {
-                       set_bit(PLATFORM_PROFILE_BALANCED_PERFORMANCE,
-                               platform_profile_handler.choices);
-                       acer_predator_v4_max_perf =
-                               ACER_PREDATOR_V4_THERMAL_PROFILE_PERFORMANCE;
-               }
-
-               if (test_bit(ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO, &supported_profiles)) {
-                       set_bit(PLATFORM_PROFILE_PERFORMANCE,
-                               platform_profile_handler.choices);
-                       acer_predator_v4_max_perf =
-                               ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO;
-               }
-
                err = platform_profile_register(&platform_profile_handler, NULL);
                if (err)
                        return err;

diff --git a/drivers/platform/x86/amd/pmf/sps.c b/drivers/platform/x86/amd/pmf/sps.c
index 6ae82ae86d22cb3a61cac3db0fab06ab81669f79..e710405b581f010007382d58c357b91aebde2968 100644 (file)
--- a/drivers/platform/x86/amd/pmf/sps.c
+++ b/drivers/platform/x86/amd/pmf/sps.c
@@ -387,7 +387,17 @@ static int amd_pmf_profile_set(struct device *dev,
        return 0;
 }
 
+static int amd_pmf_profile_probe(void *drvdata, unsigned long *choices)
+{
+       set_bit(PLATFORM_PROFILE_LOW_POWER, choices);
+       set_bit(PLATFORM_PROFILE_BALANCED, choices);
+       set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
+
+       return 0;
+}
+
 static const struct platform_profile_ops amd_pmf_profile_ops = {
+       .probe = amd_pmf_profile_probe,
        .profile_get = amd_pmf_profile_get,
        .profile_set = amd_pmf_profile_set,
 };
@@ -414,11 +424,6 @@ int amd_pmf_init_sps(struct amd_pmf_dev *dev)
        dev->pprof.dev = dev->dev;
        dev->pprof.ops = &amd_pmf_profile_ops;
 
-       /* Setup supported modes */
-       set_bit(PLATFORM_PROFILE_LOW_POWER, dev->pprof.choices);
-       set_bit(PLATFORM_PROFILE_BALANCED, dev->pprof.choices);
-       set_bit(PLATFORM_PROFILE_PERFORMANCE, dev->pprof.choices);
-
        /* Create platform_profile structure and register */
        err = platform_profile_register(&dev->pprof, dev);
        if (err)

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 992956c89d3804191e19a8f23ba2f69dd94a1fd5..e775ec7371cee9db2933622cb57731941588de7c 100644 (file)
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -3852,7 +3852,17 @@ static int asus_wmi_platform_profile_set(struct device *dev,
        return throttle_thermal_policy_write(asus);
 }
 
+static int asus_wmi_platform_profile_probe(void *drvdata, unsigned long *choices)
+{
+       set_bit(PLATFORM_PROFILE_QUIET, choices);
+       set_bit(PLATFORM_PROFILE_BALANCED, choices);
+       set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
+
+       return 0;
+}
+
 static const struct platform_profile_ops asus_wmi_platform_profile_ops = {
+       .probe = asus_wmi_platform_profile_probe,
        .profile_get = asus_wmi_platform_profile_get,
        .profile_set = asus_wmi_platform_profile_set,
 };
@@ -3885,12 +3895,6 @@ static int platform_profile_setup(struct asus_wmi *asus)
        asus->platform_profile_handler.dev = dev;
        asus->platform_profile_handler.ops = &asus_wmi_platform_profile_ops;
 
-       set_bit(PLATFORM_PROFILE_QUIET, asus->platform_profile_handler.choices);
-       set_bit(PLATFORM_PROFILE_BALANCED,
-               asus->platform_profile_handler.choices);
-       set_bit(PLATFORM_PROFILE_PERFORMANCE,
-               asus->platform_profile_handler.choices);
-
        err = platform_profile_register(&asus->platform_profile_handler, asus);
        if (err == -EEXIST) {
                pr_warn("%s, a platform_profile handler is already registered\n", __func__);

diff --git a/drivers/platform/x86/dell/alienware-wmi.c b/drivers/platform/x86/dell/alienware-wmi.c
index b8359b177a0f65b075bf0a4164d9a86011d83ca5..e7209863e7dc6a2ad534db6cc6f3ba648727e460 100644 (file)
--- a/drivers/platform/x86/dell/alienware-wmi.c
+++ b/drivers/platform/x86/dell/alienware-wmi.c
@@ -1078,12 +1078,7 @@ static int thermal_profile_set(struct device *dev,
        return wmax_thermal_control(supported_thermal_profiles[profile]);
 }
 
-static const struct platform_profile_ops awcc_platform_profile_ops = {
-       .profile_get = thermal_profile_get,
-       .profile_set = thermal_profile_set,
-};
-
-static int create_thermal_profile(struct platform_device *platform_device)
+static int thermal_profile_probe(void *drvdata, unsigned long *choices)
 {
        enum platform_profile_option profile;
        enum wmax_thermal_mode mode;
@@ -1116,19 +1111,30 @@ static int create_thermal_profile(struct platform_device *platform_device)
                profile = wmax_mode_to_platform_profile[mode];
                supported_thermal_profiles[profile] = out_data;
 
-               set_bit(profile, pp_handler.choices);
+               set_bit(profile, choices);
        }
 
-       if (bitmap_empty(pp_handler.choices, PLATFORM_PROFILE_LAST))
+       if (bitmap_empty(choices, PLATFORM_PROFILE_LAST))
                return -ENODEV;
 
        if (quirks->gmode) {
                supported_thermal_profiles[PLATFORM_PROFILE_PERFORMANCE] =
                        WMAX_THERMAL_MODE_GMODE;
 
-               set_bit(PLATFORM_PROFILE_PERFORMANCE, pp_handler.choices);
+               set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
        }
 
+       return 0;
+}
+
+static const struct platform_profile_ops awcc_platform_profile_ops = {
+       .probe = thermal_profile_probe,
+       .profile_get = thermal_profile_get,
+       .profile_set = thermal_profile_set,
+};
+
+static int create_thermal_profile(struct platform_device *platform_device)
+{
        pp_handler.name = "alienware-wmi";
        pp_handler.dev = &platform_device->dev;
        pp_handler.ops = &awcc_platform_profile_ops;

diff --git a/drivers/platform/x86/dell/dell-pc.c b/drivers/platform/x86/dell/dell-pc.c
index 9010a231f209bffbbf38ebd12d076f4f7fa52a5d..32b3be0723f8197fca33b80bd6506dad7528e64c 100644 (file)
--- a/drivers/platform/x86/dell/dell-pc.c
+++ b/drivers/platform/x86/dell/dell-pc.c
@@ -24,6 +24,7 @@
 #include "dell-smbios.h"
 
 static struct platform_device *platform_device;
+static int supported_modes;
 
 static const struct dmi_system_id dell_device_table[] __initconst = {
        {
@@ -231,7 +232,22 @@ static int thermal_platform_profile_get(struct device *dev,
        return 0;
 }
 
+static int thermal_platform_profile_probe(void *drvdata, unsigned long *choices)
+{
+       if (supported_modes & DELL_QUIET)
+               set_bit(PLATFORM_PROFILE_QUIET, choices);
+       if (supported_modes & DELL_COOL_BOTTOM)
+               set_bit(PLATFORM_PROFILE_COOL, choices);
+       if (supported_modes & DELL_BALANCED)
+               set_bit(PLATFORM_PROFILE_BALANCED, choices);
+       if (supported_modes & DELL_PERFORMANCE)
+               set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
+
+       return 0;
+}
+
 static const struct platform_profile_ops dell_pc_platform_profile_ops = {
+       .probe = thermal_platform_profile_probe,
        .profile_get = thermal_platform_profile_get,
        .profile_set = thermal_platform_profile_set,
 };
@@ -239,7 +255,6 @@ static const struct platform_profile_ops dell_pc_platform_profile_ops = {
 static int thermal_init(void)
 {
        int ret;
-       int supported_modes;
 
        /* If thermal commands are not supported, exit without error */
        if (!dell_smbios_class_is_supported(CLASS_INFO))
@@ -265,15 +280,6 @@ static int thermal_init(void)
        thermal_handler->dev = &platform_device->dev;
        thermal_handler->ops = &dell_pc_platform_profile_ops;
 
-       if (supported_modes & DELL_QUIET)
-               set_bit(PLATFORM_PROFILE_QUIET, thermal_handler->choices);
-       if (supported_modes & DELL_COOL_BOTTOM)
-               set_bit(PLATFORM_PROFILE_COOL, thermal_handler->choices);
-       if (supported_modes & DELL_BALANCED)
-               set_bit(PLATFORM_PROFILE_BALANCED, thermal_handler->choices);
-       if (supported_modes & DELL_PERFORMANCE)
-               set_bit(PLATFORM_PROFILE_PERFORMANCE, thermal_handler->choices);
-
        /* Clean up if failed */
        ret = platform_profile_register(thermal_handler, NULL);
        if (ret)

diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c
index 60328b35be743302b542cc1a311455d81609d30c..75bcd8460e7cd72eff793f0031b6d9091b4cfb0e 100644 (file)
--- a/drivers/platform/x86/hp/hp-wmi.c
+++ b/drivers/platform/x86/hp/hp-wmi.c
@@ -1488,6 +1488,23 @@ static int platform_profile_victus_set(struct device *dev,
        return 0;
 }
 
+static int hp_wmi_platform_profile_probe(void *drvdata, unsigned long *choices)
+{
+       if (is_omen_thermal_profile()) {
+               set_bit(PLATFORM_PROFILE_COOL, choices);
+       } else if (is_victus_thermal_profile()) {
+               set_bit(PLATFORM_PROFILE_QUIET, choices);
+       } else {
+               set_bit(PLATFORM_PROFILE_QUIET, choices);
+               set_bit(PLATFORM_PROFILE_COOL, choices);
+       }
+
+       set_bit(PLATFORM_PROFILE_BALANCED, choices);
+       set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
+
+       return 0;
+}
+
 static int omen_powersource_event(struct notifier_block *nb,
                                  unsigned long value,
                                  void *data)
@@ -1566,16 +1583,19 @@ static inline void omen_unregister_powersource_event_handler(void)
 }
 
 static const struct platform_profile_ops platform_profile_omen_ops = {
+       .probe = hp_wmi_platform_profile_probe,
        .profile_get = platform_profile_omen_get,
        .profile_set = platform_profile_omen_set,
 };
 
 static const struct platform_profile_ops platform_profile_victus_ops = {
+       .probe = hp_wmi_platform_profile_probe,
        .profile_get = platform_profile_victus_get,
        .profile_set = platform_profile_victus_set,
 };
 
 static const struct platform_profile_ops hp_wmi_platform_profile_ops = {
+       .probe = hp_wmi_platform_profile_probe,
        .profile_get = hp_wmi_platform_profile_get,
        .profile_set = hp_wmi_platform_profile_set,
 };
@@ -1598,8 +1618,6 @@ static int thermal_profile_setup(struct platform_device *device)
                        return err;
 
                platform_profile_handler.ops = &platform_profile_omen_ops;
-
-               set_bit(PLATFORM_PROFILE_COOL, platform_profile_handler.choices);
        } else if (is_victus_thermal_profile()) {
                err = platform_profile_victus_get_ec(&active_platform_profile);
                if (err < 0)
@@ -1614,8 +1632,6 @@ static int thermal_profile_setup(struct platform_device *device)
                        return err;
 
                platform_profile_handler.ops = &platform_profile_victus_ops;
-
-               set_bit(PLATFORM_PROFILE_QUIET, platform_profile_handler.choices);
        } else {
                tp = thermal_profile_get();
 
@@ -1631,15 +1647,10 @@ static int thermal_profile_setup(struct platform_device *device)
                        return err;
 
                platform_profile_handler.ops = &hp_wmi_platform_profile_ops;
-
-               set_bit(PLATFORM_PROFILE_QUIET, platform_profile_handler.choices);
-               set_bit(PLATFORM_PROFILE_COOL, platform_profile_handler.choices);
        }
 
        platform_profile_handler.name = "hp-wmi";
        platform_profile_handler.dev = &device->dev;
-       set_bit(PLATFORM_PROFILE_BALANCED, platform_profile_handler.choices);
-       set_bit(PLATFORM_PROFILE_PERFORMANCE, platform_profile_handler.choices);
 
        err = platform_profile_register(&platform_profile_handler, NULL);
        if (err)

diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 96e99513b0b592d6a0a877f00e465d826270b67d..050919a28d2b959dd71472490f8f02bfa12f81c5 100644 (file)
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -1023,6 +1023,15 @@ static int dytc_profile_set(struct device *dev,
        return -EINTR;
 }
 
+static int dytc_profile_probe(void *drvdata, unsigned long *choices)
+{
+       set_bit(PLATFORM_PROFILE_LOW_POWER, choices);
+       set_bit(PLATFORM_PROFILE_BALANCED, choices);
+       set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
+
+       return 0;
+}
+
 static void dytc_profile_refresh(struct ideapad_private *priv)
 {
        enum platform_profile_option profile;
@@ -1064,6 +1073,7 @@ static const struct dmi_system_id ideapad_dytc_v4_allow_table[] = {
 };
 
 static const struct platform_profile_ops dytc_profile_ops = {
+       .probe = dytc_profile_probe,
        .profile_get = dytc_profile_get,
        .profile_set = dytc_profile_set,
 };
@@ -1112,11 +1122,6 @@ static int ideapad_dytc_profile_init(struct ideapad_private *priv)
        priv->dytc->priv = priv;
        priv->dytc->pprof.ops = &dytc_profile_ops;
 
-       /* Setup supported modes */
-       set_bit(PLATFORM_PROFILE_LOW_POWER, priv->dytc->pprof.choices);
-       set_bit(PLATFORM_PROFILE_BALANCED, priv->dytc->pprof.choices);
-       set_bit(PLATFORM_PROFILE_PERFORMANCE, priv->dytc->pprof.choices);
-
        /* Create platform_profile structure and register */
        err = platform_profile_register(&priv->dytc->pprof, &priv->dytc);
        if (err)

diff --git a/drivers/platform/x86/inspur_platform_profile.c b/drivers/platform/x86/inspur_platform_profile.c
index d0a8e4eebffa41092891e1df38b086146b09b4f1..06df3aae9a5670eb4370d02776f4c9ede9e5026c 100644 (file)
--- a/drivers/platform/x86/inspur_platform_profile.c
+++ b/drivers/platform/x86/inspur_platform_profile.c
@@ -164,7 +164,17 @@ static int inspur_platform_profile_get(struct device *dev,
        return 0;
 }
 
+static int inspur_platform_profile_probe(void *drvdata, unsigned long *choices)
+{
+       set_bit(PLATFORM_PROFILE_LOW_POWER, choices);
+       set_bit(PLATFORM_PROFILE_BALANCED, choices);
+       set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
+
+       return 0;
+}
+
 static const struct platform_profile_ops inspur_platform_profile_ops = {
+       .probe = inspur_platform_profile_probe,
        .profile_get = inspur_platform_profile_get,
        .profile_set = inspur_platform_profile_set,
 };
@@ -184,10 +194,6 @@ static int inspur_wmi_probe(struct wmi_device *wdev, const void *context)
        priv->handler.dev = &wdev->dev;
        priv->handler.ops = &inspur_platform_profile_ops;
 
-       set_bit(PLATFORM_PROFILE_LOW_POWER, priv->handler.choices);
-       set_bit(PLATFORM_PROFILE_BALANCED, priv->handler.choices);
-       set_bit(PLATFORM_PROFILE_PERFORMANCE, priv->handler.choices);
-
        return platform_profile_register(&priv->handler, priv);
 }
 

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 9e26f5670fc78548563d34cb8cf14c5fa6e26ac1..62b2ddfe7c0ad262084e9f319636a31fb41b0ae8 100644 (file)
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -10539,7 +10539,17 @@ unlock:
        return err;
 }
 
+static int dytc_profile_probe(void *drvdata, unsigned long *choices)
+{
+       set_bit(PLATFORM_PROFILE_LOW_POWER, choices);
+       set_bit(PLATFORM_PROFILE_BALANCED, choices);
+       set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
+
+       return 0;
+}
+
 static const struct platform_profile_ops dytc_profile_ops = {
+       .probe = dytc_profile_probe,
        .profile_get = dytc_profile_get,
        .profile_set = dytc_profile_set,
 };
@@ -10585,11 +10595,6 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)
 {
        int err, output;
 
-       /* Setup supported modes */
-       set_bit(PLATFORM_PROFILE_LOW_POWER, dytc_profile.choices);
-       set_bit(PLATFORM_PROFILE_BALANCED, dytc_profile.choices);
-       set_bit(PLATFORM_PROFILE_PERFORMANCE, dytc_profile.choices);
-
        err = dytc_command(DYTC_CMD_QUERY, &output);
        if (err)
                return err;

diff --git a/include/linux/platform_profile.h b/include/linux/platform_profile.h
index 6013c05d7b863168a66c14d8bc204ae6b4c1753c..5ad1ab7b75e410a323e84f385fbca5916285bef9 100644 (file)
--- a/include/linux/platform_profile.h
+++ b/include/linux/platform_profile.h
@@ -31,6 +31,7 @@ enum platform_profile_option {
 struct platform_profile_handler;
 
 struct platform_profile_ops {
+       int (*probe)(void *drvdata, unsigned long *choices);
        int (*profile_get)(struct device *dev, enum platform_profile_option *profile);
        int (*profile_set)(struct device *dev, enum platform_profile_option profile);
 };