Skip to content

Commit

Permalink
platform/x86: alienware-wmi: Refactor hdmi, amplifier, deepslp methods
Browse files Browse the repository at this point in the history 
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>
Link: https://lore.kernel.org/r/20250207154610.13675-6-kuurtb@gmail.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
  • Loading branch information
Kurt Borja authored and Ilpo Järvinen committed Feb 10, 2025
1 parent 21cc9de commit 7292fb2
Showing 1 changed file with 40 additions and 36 deletions.
76 changes: 40 additions & 36 deletions drivers/platform/x86/dell/alienware-wmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down Expand Up @@ -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");
}

Expand Down Expand Up @@ -850,31 +852,34 @@ 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)
return sysfs_emit(buf, "disabled [s5] s5_s4\n");
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;
Expand All @@ -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;
}

Expand Down

0 comments on commit 7292fb2

Please sign in to comment.