[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <30cc845c-4080-4128-964d-95e857beb9e7@gmx.de>
Date: Wed, 6 Nov 2024 04:34:01 +0100
From: Armin Wolf <W_Armin@....de>
To: Mario Limonciello <mario.limonciello@....com>,
Hans de Goede <hdegoede@...hat.com>,
Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
Cc: "Rafael J . Wysocki" <rafael@...nel.org>, Len Brown <lenb@...nel.org>,
Maximilian Luz <luzmaximilian@...il.com>, Lee Chun-Yi <jlee@...e.com>,
Shyam Sundar S K <Shyam-sundar.S-k@....com>,
Corentin Chary <corentin.chary@...il.com>, "Luke D . Jones"
<luke@...nes.dev>, Ike Panhc <ike.pan@...onical.com>,
Henrique de Moraes Holschuh <hmh@....eng.br>,
Alexis Belmonte <alexbelm48@...il.com>,
Uwe Kleine-König <u.kleine-koenig@...gutronix.de>,
Ai Chao <aichao@...inos.cn>, Gergo Koteles <soyer@....hu>,
open list <linux-kernel@...r.kernel.org>,
"open list:ACPI" <linux-acpi@...r.kernel.org>,
"open list:MICROSOFT SURFACE PLATFORM PROFILE DRIVER"
<platform-driver-x86@...r.kernel.org>,
"open list:THINKPAD ACPI EXTRAS DRIVER"
<ibm-acpi-devel@...ts.sourceforge.net>,
Mark Pearson <mpearson-lenovo@...ebb.ca>,
Matthew Schwartz <matthew.schwartz@...ux.dev>
Subject: Re: [PATCH v4 04/20] ACPI: platform_profile: Add platform handler
argument to platform_profile_remove()
Am 05.11.24 um 16:33 schrieb Mario Limonciello:
> 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.
Reviewed-by: Armin Wolf <W_Armin@....de>
> Tested-by: Matthew Schwartz <matthew.schwartz@...ux.dev>
> Reviewed-by: Hans de Goede <hdegoede@...hat.com>
> Reviewed-by: Mark Pearson <mpearson-lenovo@...ebb.ca>
> Reviewed-by: Maximilian Luz <luzmaximilian@...il.com>
> Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>
> Signed-off-by: Mario Limonciello <mario.limonciello@....com>
> ---
> v4:
> * Add alienware-wmi too
> ---
> drivers/acpi/platform_profile.c | 2 +-
> drivers/platform/surface/surface_platform_profile.c | 6 +++++-
> 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/alienware-wmi.c | 2 +-
> 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 | 5 ++++-
> drivers/platform/x86/thinkpad_acpi.c | 2 +-
> include/linux/platform_profile.h | 2 +-
> 12 files changed, 21 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/acpi/platform_profile.c b/drivers/acpi/platform_profile.c
> index 5d9f3f7ba71c5..c76b8e3fdcde6 100644
> --- a/drivers/acpi/platform_profile.c
> +++ b/drivers/acpi/platform_profile.c
> @@ -210,7 +210,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 5f45f8e8cd69b..b449c4c8b883c 100644
> --- a/drivers/platform/surface/surface_platform_profile.c
> +++ b/drivers/platform/surface/surface_platform_profile.c
> @@ -210,6 +210,7 @@ static int surface_platform_profile_probe(struct ssam_device *sdev)
> return -ENOMEM;
>
> tpd->sdev = sdev;
> + ssam_device_set_drvdata(sdev, tpd);
>
> tpd->handler.name = "Surface Platform Profile";
> tpd->handler.dev = &sdev->dev;
> @@ -228,7 +229,10 @@ static int surface_platform_profile_probe(struct ssam_device *sdev)
>
> static void surface_platform_profile_remove(struct ssam_device *sdev)
> {
> - platform_profile_remove();
> + struct ssam_platform_profile_device *tpd;
> +
> + tpd = ssam_device_get_drvdata(sdev);
> + platform_profile_remove(&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 aca4a5746bee1..b12965d9fcdb7 100644
> --- a/drivers/platform/x86/acer-wmi.c
> +++ b/drivers/platform/x86/acer-wmi.c
> @@ -2547,7 +2547,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:
> @@ -2570,7 +2570,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 1b94af7c0e0c4..bd2bd6cfc39a0 100644
> --- a/drivers/platform/x86/amd/pmf/sps.c
> +++ b/drivers/platform/x86/amd/pmf/sps.c
> @@ -426,5 +426,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 78621b2af0ddb..0750e2fe65325 100644
> --- a/drivers/platform/x86/asus-wmi.c
> +++ b/drivers/platform/x86/asus-wmi.c
> @@ -4886,7 +4886,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);
> @@ -4913,7 +4913,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/alienware-wmi.c b/drivers/platform/x86/dell/alienware-wmi.c
> index c03b1aa7dfb5f..3cf6c371d4220 100644
> --- a/drivers/platform/x86/dell/alienware-wmi.c
> +++ b/drivers/platform/x86/dell/alienware-wmi.c
> @@ -1065,7 +1065,7 @@ static int create_thermal_profile(struct platform_device *platform_device)
> static void remove_thermal_profile(void)
> {
> if (quirks->thermal)
> - platform_profile_remove();
> + platform_profile_remove(&pp_handler);
> }
>
> static int __init alienware_wmi_init(void)
> diff --git a/drivers/platform/x86/dell/dell-pc.c b/drivers/platform/x86/dell/dell-pc.c
> index 730f97aab70cd..65989af2e4196 100644
> --- a/drivers/platform/x86/dell/dell-pc.c
> +++ b/drivers/platform/x86/dell/dell-pc.c
> @@ -292,7 +292,7 @@ static int thermal_init(void)
> static void thermal_cleanup(void)
> {
> if (thermal_handler)
> - platform_profile_remove();
> + platform_profile_remove(thermal_handler);
> platform_device_unregister(platform_device);
> }
>
> diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c
> index ffb09799142bc..6d6e13a0c6e2d 100644
> --- a/drivers/platform/x86/hp/hp-wmi.c
> +++ b/drivers/platform/x86/hp/hp-wmi.c
> @@ -1693,7 +1693,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 24367c3590c99..80797c6ae8b0b 100644
> --- a/drivers/platform/x86/ideapad-laptop.c
> +++ b/drivers/platform/x86/ideapad-laptop.c
> @@ -1136,7 +1136,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 5a53949bbbf5f..53af73a7fbf7b 100644
> --- a/drivers/platform/x86/inspur_platform_profile.c
> +++ b/drivers/platform/x86/inspur_platform_profile.c
> @@ -191,7 +191,10 @@ 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 222fba97d79a7..13798c6d5fcf3 100644
> --- a/drivers/platform/x86/thinkpad_acpi.c
> +++ b/drivers/platform/x86/thinkpad_acpi.c
> @@ -10638,7 +10638,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 daec6b9bad81f..bcaf3aa39160f 100644
> --- a/include/linux/platform_profile.h
> +++ b/include/linux/platform_profile.h
> @@ -37,7 +37,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);
>
Powered by blists - more mailing lists