Refactor show/store methods for hdmi, amplifier, deepslp sysfs groups to
use alienware_wmi_command() instead of alienware_wmax_command() which
uses deprecated WMI methods.
Reviewed-by: Armin Wolf <W_Armin@gmx.de>
Signed-off-by: Kurt Borja <kuurtb@gmail.com>
---
drivers/platform/x86/dell/alienware-wmi.c | 76 ++++++++++++-----------
1 file changed, 40 insertions(+), 36 deletions(-)
diff --git a/drivers/platform/x86/dell/alienware-wmi.c b/drivers/platform/x86/dell/alienware-wmi.c
index 525d25a1fa6c..6e12164132a6 100644
--- a/drivers/platform/x86/dell/alienware-wmi.c
+++ b/drivers/platform/x86/dell/alienware-wmi.c
@@ -711,53 +711,55 @@ static acpi_status alienware_wmax_command(void *in_args, size_t in_size,
static ssize_t cable_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
+ struct alienfx_platdata *pdata = dev_get_platdata(dev);
struct wmax_basic_args in_args = {
.arg = 0,
};
- acpi_status status;
u32 out_data;
+ int ret;
- status =
- alienware_wmax_command(&in_args, sizeof(in_args),
- WMAX_METHOD_HDMI_CABLE, &out_data);
- if (ACPI_SUCCESS(status)) {
+ ret = alienware_wmi_command(pdata->wdev, WMAX_METHOD_HDMI_CABLE,
+ &in_args, sizeof(in_args), &out_data);
+ if (!ret) {
if (out_data == 0)
return sysfs_emit(buf, "[unconnected] connected unknown\n");
else if (out_data == 1)
return sysfs_emit(buf, "unconnected [connected] unknown\n");
}
- pr_err("alienware-wmi: unknown HDMI cable status: %d\n", status);
+
+ pr_err("alienware-wmi: unknown HDMI cable status: %d\n", ret);
return sysfs_emit(buf, "unconnected connected [unknown]\n");
}
static ssize_t source_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
+ struct alienfx_platdata *pdata = dev_get_platdata(dev);
struct wmax_basic_args in_args = {
.arg = 0,
};
- acpi_status status;
u32 out_data;
+ int ret;
- status =
- alienware_wmax_command(&in_args, sizeof(in_args),
- WMAX_METHOD_HDMI_STATUS, &out_data);
-
- if (ACPI_SUCCESS(status)) {
+ ret = alienware_wmi_command(pdata->wdev, WMAX_METHOD_HDMI_STATUS,
+ &in_args, sizeof(in_args), &out_data);
+ if (!ret) {
if (out_data == 1)
return sysfs_emit(buf, "[input] gpu unknown\n");
else if (out_data == 2)
return sysfs_emit(buf, "input [gpu] unknown\n");
}
- pr_err("alienware-wmi: unknown HDMI source status: %u\n", status);
+
+ pr_err("alienware-wmi: unknown HDMI source status: %u\n", ret);
return sysfs_emit(buf, "input gpu [unknown]\n");
}
static ssize_t source_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
+ struct alienfx_platdata *pdata = dev_get_platdata(dev);
struct wmax_basic_args args;
- acpi_status status;
+ int ret;
if (strcmp(buf, "gpu\n") == 0)
args.arg = 1;
@@ -767,12 +769,11 @@ static ssize_t source_store(struct device *dev, struct device_attribute *attr,
args.arg = 3;
pr_debug("alienware-wmi: setting hdmi to %d : %s", args.arg, buf);
- status = alienware_wmax_command(&args, sizeof(args),
- WMAX_METHOD_HDMI_SOURCE, NULL);
+ ret = alienware_wmi_command(pdata->wdev, WMAX_METHOD_HDMI_SOURCE, &args,
+ sizeof(args), NULL);
+ if (ret < 0)
+ pr_err("alienware-wmi: HDMI toggle failed: results: %u\n", ret);
- if (ACPI_FAILURE(status))
- pr_err("alienware-wmi: HDMI toggle failed: results: %u\n",
- status);
return count;
}
@@ -805,22 +806,23 @@ static const struct attribute_group hdmi_attribute_group = {
static ssize_t status_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
+ struct alienfx_platdata *pdata = dev_get_platdata(dev);
struct wmax_basic_args in_args = {
.arg = 0,
};
- acpi_status status;
u32 out_data;
+ int ret;
- status =
- alienware_wmax_command(&in_args, sizeof(in_args),
- WMAX_METHOD_AMPLIFIER_CABLE, &out_data);
- if (ACPI_SUCCESS(status)) {
+ ret = alienware_wmi_command(pdata->wdev, WMAX_METHOD_AMPLIFIER_CABLE,
+ &in_args, sizeof(in_args), &out_data);
+ if (!ret) {
if (out_data == 0)
return sysfs_emit(buf, "[unconnected] connected unknown\n");
else if (out_data == 1)
return sysfs_emit(buf, "unconnected [connected] unknown\n");
}
- pr_err("alienware-wmi: unknown amplifier cable status: %d\n", status);
+
+ pr_err("alienware-wmi: unknown amplifier cable status: %d\n", ret);
return sysfs_emit(buf, "unconnected connected [unknown]\n");
}
@@ -850,15 +852,16 @@ static const struct attribute_group amplifier_attribute_group = {
static ssize_t deepsleep_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
+ struct alienfx_platdata *pdata = dev_get_platdata(dev);
struct wmax_basic_args in_args = {
.arg = 0,
};
- acpi_status status;
u32 out_data;
+ int ret;
- status = alienware_wmax_command(&in_args, sizeof(in_args),
- WMAX_METHOD_DEEP_SLEEP_STATUS, &out_data);
- if (ACPI_SUCCESS(status)) {
+ ret = alienware_wmi_command(pdata->wdev, WMAX_METHOD_DEEP_SLEEP_STATUS,
+ &in_args, sizeof(in_args), &out_data);
+ if (!ret) {
if (out_data == 0)
return sysfs_emit(buf, "[disabled] s5 s5_s4\n");
else if (out_data == 1)
@@ -866,15 +869,17 @@ static ssize_t deepsleep_show(struct device *dev, struct device_attribute *attr,
else if (out_data == 2)
return sysfs_emit(buf, "disabled s5 [s5_s4]\n");
}
- pr_err("alienware-wmi: unknown deep sleep status: %d\n", status);
+
+ pr_err("alienware-wmi: unknown deep sleep status: %d\n", ret);
return sysfs_emit(buf, "disabled s5 s5_s4 [unknown]\n");
}
static ssize_t deepsleep_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
+ struct alienfx_platdata *pdata = dev_get_platdata(dev);
struct wmax_basic_args args;
- acpi_status status;
+ int ret;
if (strcmp(buf, "disabled\n") == 0)
args.arg = 0;
@@ -884,12 +889,11 @@ static ssize_t deepsleep_store(struct device *dev, struct device_attribute *attr
args.arg = 2;
pr_debug("alienware-wmi: setting deep sleep to %d : %s", args.arg, buf);
- status = alienware_wmax_command(&args, sizeof(args),
- WMAX_METHOD_DEEP_SLEEP_CONTROL, NULL);
+ ret = alienware_wmi_command(pdata->wdev, WMAX_METHOD_DEEP_SLEEP_CONTROL,
+ &args, sizeof(args), NULL);
+ if (!ret)
+ pr_err("alienware-wmi: deep sleep control failed: results: %u\n", ret);
- if (ACPI_FAILURE(status))
- pr_err("alienware-wmi: deep sleep control failed: results: %u\n",
- status);
return count;
}
--
2.48.1On Fri, Feb 07, 2025 at 10:46:01AM -0500, Kurt Borja wrote:
> Refactor show/store methods for hdmi, amplifier, deepslp sysfs groups to
> use alienware_wmi_command() instead of alienware_wmax_command() which
> uses deprecated WMI methods.
...
> + pr_err("alienware-wmi: unknown HDMI cable status: %d\n", ret);
Rather introduce pr_fmt() and drop all these prefixes.
> + if (!ret) {
Traditional patter is to check for errors:
if (ret) {
...do error handling...
}
> if (out_data == 1)
> return sysfs_emit(buf, "[input] gpu unknown\n");
> else if (out_data == 2)
Redundant 'else'.
> return sysfs_emit(buf, "input [gpu] unknown\n");
> }
> - pr_err("alienware-wmi: unknown HDMI source status: %u\n", status);
> +
> + pr_err("alienware-wmi: unknown HDMI source status: %u\n", ret);
> return sysfs_emit(buf, "input gpu [unknown]\n");
...
> if (strcmp(buf, "gpu\n") == 0)
Wow! This should be fixed to use sysfs_streq()
...
> + pr_err("alienware-wmi: HDMI toggle failed: results: %u\n", ret);
pr_fmt()
...
> + pr_err("alienware-wmi: unknown amplifier cable status: %d\n", ret);
Ditto.
Also note, if you have a struct device available, use the respective dev_*()
macros instead.
...
> if (strcmp(buf, "disabled\n") == 0)
sysfs_streq() / sysfs_match_string() — whatever suits better.
--
With Best Regards,
Andy Shevchenko
On Tue Feb 11, 2025 at 11:37 AM -05, Andy Shevchenko wrote:
> On Fri, Feb 07, 2025 at 10:46:01AM -0500, Kurt Borja wrote:
>> Refactor show/store methods for hdmi, amplifier, deepslp sysfs groups to
>> use alienware_wmi_command() instead of alienware_wmax_command() which
>> uses deprecated WMI methods.
>
> ...
>
>> + pr_err("alienware-wmi: unknown HDMI cable status: %d\n", ret);
>
> Rather introduce pr_fmt() and drop all these prefixes.
This was not introduced by me so it probably requires a different patch.
>
>> + if (!ret) {
>
> Traditional patter is to check for errors:
I wanted to change as little as possible the original function, as in my
opinion this would require a different patch.
>
> if (ret) {
> ...do error handling...
> }
>
>> if (out_data == 1)
>> return sysfs_emit(buf, "[input] gpu unknown\n");
>
>> else if (out_data == 2)
>
> Redundant 'else'.
>
>> return sysfs_emit(buf, "input [gpu] unknown\n");
>> }
>> - pr_err("alienware-wmi: unknown HDMI source status: %u\n", status);
>> +
>> + pr_err("alienware-wmi: unknown HDMI source status: %u\n", ret);
>> return sysfs_emit(buf, "input gpu [unknown]\n");
>
>
> ...
>
>> if (strcmp(buf, "gpu\n") == 0)
>
> Wow! This should be fixed to use sysfs_streq()
>
> ...
>
>> + pr_err("alienware-wmi: HDMI toggle failed: results: %u\n", ret);
>
> pr_fmt()
>
> ...
>
>> + pr_err("alienware-wmi: unknown amplifier cable status: %d\n", ret);
>
> Ditto.
>
> Also note, if you have a struct device available, use the respective dev_*()
> macros instead.
Same as above, this was not my line to begin with so I left it as is.
>
> ...
>
>> if (strcmp(buf, "disabled\n") == 0)
>
> sysfs_streq() / sysfs_match_string() — whatever suits better.
I can send fixes for these tho. IMO this requiere different patches.
--
~ Kurt
On Tue, Feb 11, 2025 at 12:51:59PM -0500, Kurt Borja wrote:
> On Tue Feb 11, 2025 at 11:37 AM -05, Andy Shevchenko wrote:
> > On Fri, Feb 07, 2025 at 10:46:01AM -0500, Kurt Borja wrote:
...
> >> + pr_err("alienware-wmi: unknown HDMI cable status: %d\n", ret);
> >
> > Rather introduce pr_fmt() and drop all these prefixes.
>
> This was not introduced by me so it probably requires a different patch.
Sure, it's just a side note comment.
...
> >> + if (!ret) {
> >
> > Traditional patter is to check for errors:
>
> I wanted to change as little as possible the original function, as in my
> opinion this would require a different patch.
Why? This change touches the lines, it's still needs careful checking despite
changes in it. But I can understand your line of thinking here. So, then
consider separate patch.
> >
> > if (ret) {
> > ...do error handling...
> > }
> >
> >> if (out_data == 1)
> >> return sysfs_emit(buf, "[input] gpu unknown\n");
> >
> >> else if (out_data == 2)
> >
> > Redundant 'else'.
> >
> >> return sysfs_emit(buf, "input [gpu] unknown\n");
> >> }
> >> - pr_err("alienware-wmi: unknown HDMI source status: %u\n", status);
> >> +
> >> + pr_err("alienware-wmi: unknown HDMI source status: %u\n", ret);
> >> return sysfs_emit(buf, "input gpu [unknown]\n");
--
With Best Regards,
Andy Shevchenko
© 2016 - 2025 Red Hat, Inc.