mirror of
https://github.com/torvalds/linux.git
synced 2026-05-23 22:52:19 +02:00
platform/x86: alienware-wmi: Add a state container for thermal control methods
Refactor all thermal control methods to use the newly defined awcc_priv state container instead of global variables. While at it, rename create_thermal_profile() to awcc_platform_profile_init() and introduce alienware_awcc_setup() to set up the "AWCC" WMI device driver data. Reviewed-by: Armin Wolf <W_Armin@gmx.de> Signed-off-by: Kurt Borja <kuurtb@gmail.com> Link: https://lore.kernel.org/r/20250207154610.13675-4-kuurtb@gmail.com Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
This commit is contained in:
parent
898a2302d7
commit
763c16fb14
|
|
@ -412,6 +412,12 @@ struct wmax_u32_args {
|
|||
u8 arg3;
|
||||
};
|
||||
|
||||
struct awcc_priv {
|
||||
struct wmi_device *wdev;
|
||||
struct device *ppdev;
|
||||
enum wmax_thermal_mode supported_thermal_profiles[PLATFORM_PROFILE_LAST];
|
||||
};
|
||||
|
||||
struct alienfx_priv {
|
||||
struct platform_device *pdev;
|
||||
struct led_classdev global_led;
|
||||
|
|
@ -424,8 +430,6 @@ struct alienfx_platdata {
|
|||
struct wmi_device *wdev;
|
||||
};
|
||||
|
||||
static enum wmax_thermal_mode supported_thermal_profiles[PLATFORM_PROFILE_LAST];
|
||||
|
||||
static u8 interface;
|
||||
|
||||
/*
|
||||
|
|
@ -1060,6 +1064,8 @@ static int thermal_profile_get(struct device *dev,
|
|||
static int thermal_profile_set(struct device *dev,
|
||||
enum platform_profile_option profile)
|
||||
{
|
||||
struct awcc_priv *priv = dev_get_drvdata(dev);
|
||||
|
||||
if (quirks->gmode) {
|
||||
u32 gmode_status;
|
||||
int ret;
|
||||
|
|
@ -1080,12 +1086,13 @@ static int thermal_profile_set(struct device *dev,
|
|||
}
|
||||
}
|
||||
|
||||
return wmax_thermal_control(supported_thermal_profiles[profile]);
|
||||
return wmax_thermal_control(priv->supported_thermal_profiles[profile]);
|
||||
}
|
||||
|
||||
static int thermal_profile_probe(void *drvdata, unsigned long *choices)
|
||||
{
|
||||
enum platform_profile_option profile;
|
||||
struct awcc_priv *priv = drvdata;
|
||||
enum wmax_thermal_mode mode;
|
||||
u8 sys_desc[4];
|
||||
u32 first_mode;
|
||||
|
|
@ -1114,7 +1121,7 @@ static int thermal_profile_probe(void *drvdata, unsigned long *choices)
|
|||
|
||||
mode = out_data & WMAX_THERMAL_MODE_MASK;
|
||||
profile = wmax_mode_to_platform_profile[mode];
|
||||
supported_thermal_profiles[profile] = out_data;
|
||||
priv->supported_thermal_profiles[profile] = out_data;
|
||||
|
||||
set_bit(profile, choices);
|
||||
}
|
||||
|
|
@ -1123,7 +1130,7 @@ static int thermal_profile_probe(void *drvdata, unsigned long *choices)
|
|||
return -ENODEV;
|
||||
|
||||
if (quirks->gmode) {
|
||||
supported_thermal_profiles[PLATFORM_PROFILE_PERFORMANCE] =
|
||||
priv->supported_thermal_profiles[PLATFORM_PROFILE_PERFORMANCE] =
|
||||
WMAX_THERMAL_MODE_GMODE;
|
||||
|
||||
set_bit(PLATFORM_PROFILE_PERFORMANCE, choices);
|
||||
|
|
@ -1138,14 +1145,35 @@ static const struct platform_profile_ops awcc_platform_profile_ops = {
|
|||
.profile_set = thermal_profile_set,
|
||||
};
|
||||
|
||||
static int create_thermal_profile(struct wmi_device *wdev)
|
||||
static int awcc_platform_profile_init(struct wmi_device *wdev)
|
||||
{
|
||||
struct device *ppdev;
|
||||
struct awcc_priv *priv = dev_get_drvdata(&wdev->dev);
|
||||
|
||||
ppdev = devm_platform_profile_register(&wdev->dev, "alienware-wmi",
|
||||
NULL, &awcc_platform_profile_ops);
|
||||
priv->ppdev = devm_platform_profile_register(&wdev->dev, "alienware-wmi",
|
||||
priv, &awcc_platform_profile_ops);
|
||||
|
||||
return PTR_ERR_OR_ZERO(ppdev);
|
||||
return PTR_ERR_OR_ZERO(priv->ppdev);
|
||||
}
|
||||
|
||||
static int alienware_awcc_setup(struct wmi_device *wdev)
|
||||
{
|
||||
struct awcc_priv *priv;
|
||||
int ret;
|
||||
|
||||
priv = devm_kzalloc(&wdev->dev, sizeof(*priv), GFP_KERNEL);
|
||||
if (!priv)
|
||||
return -ENOMEM;
|
||||
|
||||
priv->wdev = wdev;
|
||||
dev_set_drvdata(&wdev->dev, priv);
|
||||
|
||||
if (quirks->thermal) {
|
||||
ret = awcc_platform_profile_init(wdev);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1267,7 +1295,7 @@ static int wmax_wmi_probe(struct wmi_device *wdev, const void *context)
|
|||
int ret;
|
||||
|
||||
if (quirks->thermal)
|
||||
ret = create_thermal_profile(wdev);
|
||||
ret = alienware_awcc_setup(wdev);
|
||||
else
|
||||
ret = alienware_alienfx_setup(&pdata);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user