ACPI: platform_profile: Let drivers set drvdata to the class device

Add *drvdata to platform_profile_register() signature and assign it to
the class device.

While at it, pass specific driver state as drvdata to replace uses of
container_of() with dev_get_drvdata().

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-3-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 15f24adc57d45196c33367987af7a59575931d8a..689541d2e66c3320896d230c04472eb98f2263fb 100644 (file)
--- a/drivers/acpi/platform_profile.c
+++ b/drivers/acpi/platform_profile.c
@@ -460,7 +460,7 @@ int platform_profile_cycle(void)
 }
 EXPORT_SYMBOL_GPL(platform_profile_cycle);
 
-int platform_profile_register(struct platform_profile_handler *pprof)
+int platform_profile_register(struct platform_profile_handler *pprof, void *drvdata)
 {
        int err;
 
@@ -480,6 +480,7 @@ int platform_profile_register(struct platform_profile_handler *pprof)
 
        pprof->class_dev.class = &platform_profile_class;
        pprof->class_dev.parent = pprof->dev;
+       dev_set_drvdata(&pprof->class_dev, drvdata);
        dev_set_name(&pprof->class_dev, "platform-profile-%d", pprof->minor);
        err = device_register(&pprof->class_dev);
        if (err) {
@@ -529,7 +530,7 @@ static void devm_platform_profile_release(struct device *dev, void *res)
        platform_profile_remove(*pprof);
 }
 
-int devm_platform_profile_register(struct platform_profile_handler *pprof)
+int devm_platform_profile_register(struct platform_profile_handler *pprof, void *drvdata)
 {
        struct platform_profile_handler **dr;
        int ret;
@@ -538,7 +539,7 @@ int devm_platform_profile_register(struct platform_profile_handler *pprof)
        if (!dr)
                return -ENOMEM;
 
-       ret = platform_profile_register(pprof);
+       ret = platform_profile_register(pprof, drvdata);
        if (ret) {
                devres_free(dr);
                return ret;

diff --git a/drivers/platform/surface/surface_platform_profile.c b/drivers/platform/surface/surface_platform_profile.c
index 6c87e982bfc8f0cc78eb5341b67f16ad02d66cd0..edb9362003a4c42f12cb3b118579b30b8017d845 100644 (file)
--- a/drivers/platform/surface/surface_platform_profile.c
+++ b/drivers/platform/surface/surface_platform_profile.c
@@ -161,7 +161,7 @@ static int ssam_platform_profile_get(struct platform_profile_handler *pprof,
        enum ssam_tmp_profile tp;
        int status;
 
-       tpd = container_of(pprof, struct ssam_platform_profile_device, handler);
+       tpd = dev_get_drvdata(&pprof->class_dev);
 
        status = ssam_tmp_profile_get(tpd->sdev, &tp);
        if (status)
@@ -181,7 +181,7 @@ static int ssam_platform_profile_set(struct platform_profile_handler *pprof,
        struct ssam_platform_profile_device *tpd;
        int tp;
 
-       tpd = container_of(pprof, struct ssam_platform_profile_device, handler);
+       tpd = dev_get_drvdata(&pprof->class_dev);
 
        tp = convert_profile_to_ssam_tmp(tpd->sdev, profile);
        if (tp < 0)
@@ -224,7 +224,7 @@ static int surface_platform_profile_probe(struct ssam_device *sdev)
        set_bit(PLATFORM_PROFILE_BALANCED_PERFORMANCE, tpd->handler.choices);
        set_bit(PLATFORM_PROFILE_PERFORMANCE, tpd->handler.choices);
 
-       return platform_profile_register(&tpd->handler);
+       return platform_profile_register(&tpd->handler, tpd);
 }
 
 static void surface_platform_profile_remove(struct ssam_device *sdev)

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index acf610d591687f6e73e2af2e66c706220909bbe9..1aedf0ef41894c4a5b22e536a73ef3aa787d3716 100644 (file)
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -2073,7 +2073,7 @@ static int acer_platform_profile_setup(struct platform_device *device)
                                ACER_PREDATOR_V4_THERMAL_PROFILE_TURBO;
                }
 
-               err = platform_profile_register(&platform_profile_handler);
+               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 bd2bd6cfc39a0abdcfa47c7edc5ad66695457536..259a598acd3ee2a6c2bcdd7748e63edc78d9a20a 100644 (file)
--- a/drivers/platform/x86/amd/pmf/sps.c
+++ b/drivers/platform/x86/amd/pmf/sps.c
@@ -285,7 +285,7 @@ bool is_pprof_balanced(struct amd_pmf_dev *pmf)
 static int amd_pmf_profile_get(struct platform_profile_handler *pprof,
                               enum platform_profile_option *profile)
 {
-       struct amd_pmf_dev *pmf = container_of(pprof, struct amd_pmf_dev, pprof);
+       struct amd_pmf_dev *pmf = dev_get_drvdata(&pprof->class_dev);
 
        *profile = pmf->current_profile;
        return 0;
@@ -366,7 +366,7 @@ int amd_pmf_power_slider_update_event(struct amd_pmf_dev *dev)
 static int amd_pmf_profile_set(struct platform_profile_handler *pprof,
                               enum platform_profile_option profile)
 {
-       struct amd_pmf_dev *pmf = container_of(pprof, struct amd_pmf_dev, pprof);
+       struct amd_pmf_dev *pmf = dev_get_drvdata(&pprof->class_dev);
        int ret = 0;
 
        pmf->current_profile = profile;
@@ -416,7 +416,7 @@ int amd_pmf_init_sps(struct amd_pmf_dev *dev)
        set_bit(PLATFORM_PROFILE_PERFORMANCE, dev->pprof.choices);
 
        /* Create platform_profile structure and register */
-       err = platform_profile_register(&dev->pprof);
+       err = platform_profile_register(&dev->pprof, dev);
        if (err)
                dev_err(dev->dev, "Failed to register SPS support, this is most likely an SBIOS bug: %d\n",
                        err);

diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 6c674de60ec06254eda09c7d52922dbd5cbc2764..f91099792cb96116cf965445b1a7fd42a2001ceb 100644 (file)
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -3806,7 +3806,7 @@ static int asus_wmi_platform_profile_get(struct platform_profile_handler *pprof,
        struct asus_wmi *asus;
        int tp;
 
-       asus = container_of(pprof, struct asus_wmi, platform_profile_handler);
+       asus = dev_get_drvdata(&pprof->class_dev);
        tp = asus->throttle_thermal_policy_mode;
 
        switch (tp) {
@@ -3832,7 +3832,7 @@ static int asus_wmi_platform_profile_set(struct platform_profile_handler *pprof,
        struct asus_wmi *asus;
        int tp;
 
-       asus = container_of(pprof, struct asus_wmi, platform_profile_handler);
+       asus = dev_get_drvdata(&pprof->class_dev);
 
        switch (profile) {
        case PLATFORM_PROFILE_PERFORMANCE:
@@ -3887,7 +3887,7 @@ static int platform_profile_setup(struct asus_wmi *asus)
        set_bit(PLATFORM_PROFILE_PERFORMANCE,
                asus->platform_profile_handler.choices);
 
-       err = platform_profile_register(&asus->platform_profile_handler);
+       err = platform_profile_register(&asus->platform_profile_handler, asus);
        if (err == -EEXIST) {
                pr_warn("%s, a platform_profile handler is already registered\n", __func__);
                return 0;

diff --git a/drivers/platform/x86/dell/alienware-wmi.c b/drivers/platform/x86/dell/alienware-wmi.c
index d7f577e0d1464d74821edec70d975fcbc0a91fbb..154c417a438c6c3860af5b4f1b1fc6f813806d38 100644 (file)
--- a/drivers/platform/x86/dell/alienware-wmi.c
+++ b/drivers/platform/x86/dell/alienware-wmi.c
@@ -1129,7 +1129,7 @@ static int create_thermal_profile(struct platform_device *platform_device)
        pp_handler.name = "alienware-wmi";
        pp_handler.dev = &platform_device->dev;
 
-       return devm_platform_profile_register(&pp_handler);
+       return devm_platform_profile_register(&pp_handler, NULL);
 }
 
 /*

diff --git a/drivers/platform/x86/dell/dell-pc.c b/drivers/platform/x86/dell/dell-pc.c
index 3797a5721dbde6c6e41aafc4146ceb51134d7e29..1a0a721d706f82c6c3a867d429e2be070cfd4f63 100644 (file)
--- a/drivers/platform/x86/dell/dell-pc.c
+++ b/drivers/platform/x86/dell/dell-pc.c
@@ -271,7 +271,7 @@ static int thermal_init(void)
                set_bit(PLATFORM_PROFILE_PERFORMANCE, thermal_handler->choices);
 
        /* Clean up if failed */
-       ret = platform_profile_register(thermal_handler);
+       ret = platform_profile_register(thermal_handler, NULL);
        if (ret)
                goto cleanup_thermal_handler;
 

diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c
index 6d6e13a0c6e2d24e764bad6ff2cafabb42001ac3..8e5e1422e02435511ab80c6a250c9010f204e579 100644 (file)
--- a/drivers/platform/x86/hp/hp-wmi.c
+++ b/drivers/platform/x86/hp/hp-wmi.c
@@ -1629,7 +1629,7 @@ static int thermal_profile_setup(struct platform_device *device)
        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);
+       err = platform_profile_register(&platform_profile_handler, NULL);
        if (err)
                return err;
 

diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index dc98f862a06d52ab9ae06d497c2f6272d2a33909..ed0d880a07a96e94e5af2c36378efb4af845a1c9 100644 (file)
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -936,7 +936,7 @@ static int convert_profile_to_dytc(enum platform_profile_option profile, int *pe
 static int dytc_profile_get(struct platform_profile_handler *pprof,
                            enum platform_profile_option *profile)
 {
-       struct ideapad_dytc_priv *dytc = container_of(pprof, struct ideapad_dytc_priv, pprof);
+       struct ideapad_dytc_priv *dytc = dev_get_drvdata(&pprof->class_dev);
 
        *profile = dytc->current_profile;
        return 0;
@@ -989,7 +989,7 @@ static int dytc_cql_command(struct ideapad_private *priv, unsigned long cmd,
 static int dytc_profile_set(struct platform_profile_handler *pprof,
                            enum platform_profile_option profile)
 {
-       struct ideapad_dytc_priv *dytc = container_of(pprof, struct ideapad_dytc_priv, pprof);
+       struct ideapad_dytc_priv *dytc = dev_get_drvdata(&pprof->class_dev);
        struct ideapad_private *priv = dytc->priv;
        unsigned long output;
        int err;
@@ -1114,7 +1114,7 @@ static int ideapad_dytc_profile_init(struct ideapad_private *priv)
        set_bit(PLATFORM_PROFILE_PERFORMANCE, priv->dytc->pprof.choices);
 
        /* Create platform_profile structure and register */
-       err = platform_profile_register(&priv->dytc->pprof);
+       err = platform_profile_register(&priv->dytc->pprof, &priv->dytc);
        if (err)
                goto pp_reg_failed;
 

diff --git a/drivers/platform/x86/inspur_platform_profile.c b/drivers/platform/x86/inspur_platform_profile.c
index 53af73a7fbf7b10e25e9ad0792882d0a42bb6d09..471fca50d1c99cf80dabb38531bcc5dfbb82d948 100644 (file)
--- a/drivers/platform/x86/inspur_platform_profile.c
+++ b/drivers/platform/x86/inspur_platform_profile.c
@@ -87,8 +87,7 @@ out_free:
 static int inspur_platform_profile_set(struct platform_profile_handler *pprof,
                                       enum platform_profile_option profile)
 {
-       struct inspur_wmi_priv *priv = container_of(pprof, struct inspur_wmi_priv,
-                                                   handler);
+       struct inspur_wmi_priv *priv = dev_get_drvdata(&pprof->class_dev);
        u8 ret_code[4] = {0, 0, 0, 0};
        int ret;
 
@@ -135,8 +134,7 @@ static int inspur_platform_profile_set(struct platform_profile_handler *pprof,
 static int inspur_platform_profile_get(struct platform_profile_handler *pprof,
                                       enum platform_profile_option *profile)
 {
-       struct inspur_wmi_priv *priv = container_of(pprof, struct inspur_wmi_priv,
-                                                   handler);
+       struct inspur_wmi_priv *priv = dev_get_drvdata(&pprof->class_dev);
        u8 ret_code[4] = {0, 0, 0, 0};
        int ret;
 
@@ -186,7 +184,7 @@ static int inspur_wmi_probe(struct wmi_device *wdev, const void *context)
        set_bit(PLATFORM_PROFILE_BALANCED, priv->handler.choices);
        set_bit(PLATFORM_PROFILE_PERFORMANCE, priv->handler.choices);
 
-       return platform_profile_register(&priv->handler);
+       return platform_profile_register(&priv->handler, priv);
 }
 
 static void inspur_wmi_remove(struct wmi_device *wdev)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index d99573e7a9832b26c08be40b72b31dc4bb51ce1d..8be3f4e5366d99d46f11c9214e11378ac3d2bda1 100644 (file)
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -10641,7 +10641,7 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm)
 
        dytc_profile.dev = &tpacpi_pdev->dev;
        /* Create platform_profile structure and register */
-       err = platform_profile_register(&dytc_profile);
+       err = platform_profile_register(&dytc_profile, NULL);
        /*
         * If for some reason platform_profiles aren't enabled
         * don't quit terminally.

diff --git a/include/linux/platform_profile.h b/include/linux/platform_profile.h
index 8a9b8754f9ac5c46152739c570f17cd5d21bc85e..1c8fdda51eaa373daee5e2afb6990862e1056001 100644 (file)
--- a/include/linux/platform_profile.h
+++ b/include/linux/platform_profile.h
@@ -40,9 +40,9 @@ struct platform_profile_handler {
                                enum platform_profile_option profile);
 };
 
-int platform_profile_register(struct platform_profile_handler *pprof);
+int platform_profile_register(struct platform_profile_handler *pprof, void *drvdata);
 int platform_profile_remove(struct platform_profile_handler *pprof);
-int devm_platform_profile_register(struct platform_profile_handler *pprof);
+int devm_platform_profile_register(struct platform_profile_handler *pprof, void *drvdata);
 int platform_profile_cycle(void);
 void platform_profile_notify(struct platform_profile_handler *pprof);