On Mon, 3 Feb 2025, 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.
>
> Reviewed-by: Armin Wolf <W_Armin@xxxxxx>
> Signed-off-by: Kurt Borja <kuurtb@xxxxxxxxx>
> ---
> drivers/platform/x86/dell/alienware-wmi.c | 80 +++++++++++++----------
> 1 file changed, 45 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/platform/x86/dell/alienware-wmi.c b/drivers/platform/x86/dell/alienware-wmi.c
> index 525d25a1fa6c..412caf0e3b84 100644
> --- a/drivers/platform/x86/dell/alienware-wmi.c
> +++ b/drivers/platform/x86/dell/alienware-wmi.c
> @@ -711,53 +711,57 @@ 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;
> +
> + ret = alienware_wmi_command(pdata->wdev, WMAX_METHOD_HDMI_CABLE,
> + &in_args, sizeof(in_args), &out_data);
>
> - status =
> - alienware_wmax_command(&in_args, sizeof(in_args),
> - WMAX_METHOD_HDMI_CABLE, &out_data);
> - if (ACPI_SUCCESS(status)) {
> + 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);
> + ret = alienware_wmi_command(pdata->wdev, WMAX_METHOD_HDMI_STATUS,
> + &in_args, sizeof(in_args), &out_data);
>
> - if (ACPI_SUCCESS(status)) {
> + 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 +771,12 @@ 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 +809,24 @@ 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) {
Hi, I noticed one minor style problem while trying to apply these I'd
like to get addressed before I take them.
Could you please remove the empty line in between the call and its error
handling for the calls you touch. There are a few such cases at least in
this patch.
Thanks in advance.
--
i.
> 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 +856,17 @@ 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 +874,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 +894,12 @@ 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;
> }
>
>
