]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
platform/x86: asus-wmi: Use devm_platform_profile_register()
authorKurt Borja <kuurtb@gmail.com>
Thu, 16 Jan 2025 00:27:11 +0000 (19:27 -0500)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Thu, 16 Jan 2025 15:26:36 +0000 (17:26 +0200)
Replace platform_profile_register() with it's device managed version.
Also replace pr_err with dev_err in case of error and make the error
message more user-friendly.

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-10-kuurtb@gmail.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/asus-wmi.c

index e775ec7371cee9db2933622cb57731941588de7c..7aa837f74fd0c4e5e27f464fd6ff4fa262cb5fda 100644 (file)
@@ -3895,12 +3895,9 @@ 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;
 
-       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;
-       } else if (err) {
-               pr_err("%s, failed at platform_profile_register: %d\n", __func__, err);
+       err = devm_platform_profile_register(&asus->platform_profile_handler, asus);
+       if (err) {
+               dev_err(dev, "Failed to register a platform_profile class device\n");
                return err;
        }
 
@@ -4859,8 +4856,6 @@ fail_input:
 fail_sysfs:
 fail_custom_fan_curve:
 fail_platform_profile_setup:
-       if (asus->platform_profile_support)
-               platform_profile_remove(&asus->platform_profile_handler);
 fail_fan_boost_mode:
 fail_platform:
        kfree(asus);
@@ -4886,9 +4881,6 @@ static void asus_wmi_remove(struct platform_device *device)
        throttle_thermal_policy_set_default(asus);
        asus_wmi_battery_exit(asus);
 
-       if (asus->platform_profile_support)
-               platform_profile_remove(&asus->platform_profile_handler);
-
        kfree(asus);
 }