On Fri, Oct 25, 2024, at 3:30 PM, Mario Limonciello wrote:
> To allow registering and unregistering multiple platform handlers calls
> to platform_profile_remove() will need to know which handler is to be
> removed. Add an argument for this.
>
> Tested-by: Matthew Schwartz <matthew.schwartz@xxxxxxxxx>
> Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
> ---
> drivers/acpi/platform_profile.c | 2 +-
> drivers/platform/surface/surface_platform_profile.c | 2 +-
> drivers/platform/x86/acer-wmi.c | 4 ++--
> drivers/platform/x86/amd/pmf/sps.c | 2 +-
> drivers/platform/x86/asus-wmi.c | 4 ++--
> drivers/platform/x86/dell/dell-pc.c | 2 +-
> drivers/platform/x86/hp/hp-wmi.c | 2 +-
> drivers/platform/x86/ideapad-laptop.c | 2 +-
> drivers/platform/x86/inspur_platform_profile.c | 4 +++-
> drivers/platform/x86/thinkpad_acpi.c | 2 +-
> include/linux/platform_profile.h | 2 +-
> 11 files changed, 15 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/acpi/platform_profile.c
> b/drivers/acpi/platform_profile.c
> index d2f7fd7743a13..c24744da20916 100644
> --- a/drivers/acpi/platform_profile.c
> +++ b/drivers/acpi/platform_profile.c
> @@ -205,7 +205,7 @@ int platform_profile_register(struct
> platform_profile_handler *pprof)
> }
> EXPORT_SYMBOL_GPL(platform_profile_register);
>
> -int platform_profile_remove(void)
> +int platform_profile_remove(struct platform_profile_handler *pprof)
> {
> sysfs_remove_group(acpi_kobj, &platform_profile_group);
>
> diff --git a/drivers/platform/surface/surface_platform_profile.c
> b/drivers/platform/surface/surface_platform_profile.c
> index 958afd7bce223..0879b739c5e8b 100644
> --- a/drivers/platform/surface/surface_platform_profile.c
> +++ b/drivers/platform/surface/surface_platform_profile.c
> @@ -228,7 +228,7 @@ static int surface_platform_profile_probe(struct
> ssam_device *sdev)
>
> static void surface_platform_profile_remove(struct ssam_device *sdev)
> {
> - platform_profile_remove();
> + platform_profile_remove(&sdev->tpd->handler);
> }
>
> static const struct ssam_device_id ssam_platform_profile_match[] = {
> diff --git a/drivers/platform/x86/acer-wmi.c
> b/drivers/platform/x86/acer-wmi.c
> index 53fbc9b4d3df7..71761d4220c26 100644
> --- a/drivers/platform/x86/acer-wmi.c
> +++ b/drivers/platform/x86/acer-wmi.c
> @@ -2546,7 +2546,7 @@ static int acer_platform_probe(struct
> platform_device *device)
>
> error_hwmon:
> if (platform_profile_support)
> - platform_profile_remove();
> + platform_profile_remove(&platform_profile_handler);
> error_platform_profile:
> acer_rfkill_exit();
> error_rfkill:
> @@ -2569,7 +2569,7 @@ static void acer_platform_remove(struct
> platform_device *device)
> acer_rfkill_exit();
>
> if (platform_profile_support)
> - platform_profile_remove();
> + platform_profile_remove(&platform_profile_handler);
> }
>
> #ifdef CONFIG_PM_SLEEP
> diff --git a/drivers/platform/x86/amd/pmf/sps.c
> b/drivers/platform/x86/amd/pmf/sps.c
> index e2d0cc92c4396..cfa88c0c9e594 100644
> --- a/drivers/platform/x86/amd/pmf/sps.c
> +++ b/drivers/platform/x86/amd/pmf/sps.c
> @@ -425,5 +425,5 @@ int amd_pmf_init_sps(struct amd_pmf_dev *dev)
>
> void amd_pmf_deinit_sps(struct amd_pmf_dev *dev)
> {
> - platform_profile_remove();
> + platform_profile_remove(&dev->pprof);
> }
> diff --git a/drivers/platform/x86/asus-wmi.c
> b/drivers/platform/x86/asus-wmi.c
> index c7c104c65a85a..f5f8cda7fd19c 100644
> --- a/drivers/platform/x86/asus-wmi.c
> +++ b/drivers/platform/x86/asus-wmi.c
> @@ -4885,7 +4885,7 @@ static int asus_wmi_add(struct platform_device
> *pdev)
> fail_custom_fan_curve:
> fail_platform_profile_setup:
> if (asus->platform_profile_support)
> - platform_profile_remove();
> + platform_profile_remove(&asus->platform_profile_handler);
> fail_fan_boost_mode:
> fail_platform:
> kfree(asus);
> @@ -4912,7 +4912,7 @@ static void asus_wmi_remove(struct
> platform_device *device)
> asus_wmi_battery_exit(asus);
>
> if (asus->platform_profile_support)
> - platform_profile_remove();
> + platform_profile_remove(&asus->platform_profile_handler);
>
> kfree(asus);
> }
> diff --git a/drivers/platform/x86/dell/dell-pc.c
> b/drivers/platform/x86/dell/dell-pc.c
> index 3cf79e55e3129..4196154cc37d9 100644
> --- a/drivers/platform/x86/dell/dell-pc.c
> +++ b/drivers/platform/x86/dell/dell-pc.c
> @@ -273,7 +273,7 @@ static int thermal_init(void)
> static void thermal_cleanup(void)
> {
> if (thermal_handler) {
> - platform_profile_remove();
> + platform_profile_remove(thermal_handler);
> kfree(thermal_handler);
> }
> }
> diff --git a/drivers/platform/x86/hp/hp-wmi.c
> b/drivers/platform/x86/hp/hp-wmi.c
> index 26cac73caf2b9..bb8771d8b5cd8 100644
> --- a/drivers/platform/x86/hp/hp-wmi.c
> +++ b/drivers/platform/x86/hp/hp-wmi.c
> @@ -1692,7 +1692,7 @@ static void __exit hp_wmi_bios_remove(struct
> platform_device *device)
> }
>
> if (platform_profile_support)
> - platform_profile_remove();
> + platform_profile_remove(&platform_profile_handler);
> }
>
> static int hp_wmi_resume_handler(struct device *device)
> diff --git a/drivers/platform/x86/ideapad-laptop.c
> b/drivers/platform/x86/ideapad-laptop.c
> index 1f94c14c3b832..50819ac919e87 100644
> --- a/drivers/platform/x86/ideapad-laptop.c
> +++ b/drivers/platform/x86/ideapad-laptop.c
> @@ -1135,7 +1135,7 @@ static void ideapad_dytc_profile_exit(struct
> ideapad_private *priv)
> if (!priv->dytc)
> return;
>
> - platform_profile_remove();
> + platform_profile_remove(&priv->dytc->pprof);
> mutex_destroy(&priv->dytc->mutex);
> kfree(priv->dytc);
>
> diff --git a/drivers/platform/x86/inspur_platform_profile.c
> b/drivers/platform/x86/inspur_platform_profile.c
> index 03da2c8cf6789..f6bc5ca9da91d 100644
> --- a/drivers/platform/x86/inspur_platform_profile.c
> +++ b/drivers/platform/x86/inspur_platform_profile.c
> @@ -190,7 +190,9 @@ static int inspur_wmi_probe(struct wmi_device
> *wdev, const void *context)
>
> static void inspur_wmi_remove(struct wmi_device *wdev)
> {
> - platform_profile_remove();
> + struct inspur_wmi_priv *priv;
> + priv = dev_get_drvdata(&wdev->dev);
> + platform_profile_remove(&priv->handler);
> }
>
> static const struct wmi_device_id inspur_wmi_id_table[] = {
> diff --git a/drivers/platform/x86/thinkpad_acpi.c
> b/drivers/platform/x86/thinkpad_acpi.c
> index c8c316b8507a5..619a4db74e5f3 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -10637,7 +10637,7 @@ static int tpacpi_dytc_profile_init(struct
> ibm_init_struct *iibm)
>
> static void dytc_profile_exit(void)
> {
> - platform_profile_remove();
> + platform_profile_remove(&dytc_profile);
> }
>
> static struct ibm_struct dytc_profile_driver_data = {
> diff --git a/include/linux/platform_profile.h b/include/linux/platform_profile.h
> index 6fa988e417428..58279b76d740e 100644
> --- a/include/linux/platform_profile.h
> +++ b/include/linux/platform_profile.h
> @@ -36,7 +36,7 @@ struct platform_profile_handler {
> };
>
> int platform_profile_register(struct platform_profile_handler *pprof);
> -int platform_profile_remove(void);
> +int platform_profile_remove(struct platform_profile_handler *pprof);
> int platform_profile_cycle(void);
> void platform_profile_notify(void);
>
> --
> 2.43.0
Looks good to me.
Reviewed-by: Mark Pearson <mpearson-lenovo@xxxxxxxxx>
Mark
