From nobody Sun Feb 8 14:51:16 2026 Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBE2B222561; Fri, 7 Feb 2025 14:08:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738937298; cv=none; b=ROTff79nABWsxVqACBlHgPkE15J0qKbl4pcu0mrkUYE5BCWZurN1CQY+j5WSzGr4s5eZwjxbTW0rNTDsy4gQwgnCau31Z9TrGu+FJsqOqFcvE8c2565oAx6SQZYwGf5BqmUGQhKmW+tZAeJyn8JURC6nEvwqTMvIR6J8aimWjlk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738937298; c=relaxed/simple; bh=TpImHDyw13v88DYqCWjn7O634fBAq+Jz7uz+a4wm1hk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PDu4NpdyAJpUhTeuW9Pq4qF+GeGmZaL848xcI1vuIH3h1sBJC6DorpB4YWcsYYoaeUAfUDP6l0Qmn7sqsjtieDAplZ7P1MDCjEtSPNVn1KdYPLwy7iz4QKIrl8H7W0euzSnRnXno2zjQl9on0EoDTCKgy9NBqbgSxnw2I19DUxk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dZyVu7hD; arc=none smtp.client-ip=209.85.128.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dZyVu7hD" Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-6efe4324f96so18970517b3.1; Fri, 07 Feb 2025 06:08:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738937295; x=1739542095; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aT5BPDOOXltaw9HQr5o8Si+JPli8HqWhNbfpXgv/A8c=; b=dZyVu7hDAVFaQoHmrHPbXeGH+8Vq9d7Yy0QIM/8Y5E9bHlSaZnFV7cXx3Lk8RViMvM OXY+jzlyj10cwR57+5UEy8mPyGctwTNn+pwjscPP6iEbYFRYlH8P3cBSreRQa5P2Kmz5 8263yLad+613ojouS//TmAUMJMNO5SjgVV2cV71Zr1vPBdgrsnYrdLlP4om6opwCfJYw piTdEaU0dKb9iHFwI+w8McJQ0715CW1TgSKVOBLWmgAv67TZDUuUnIGda0ImefZAHOvc s5rB5GQYbt8NNTVLg9LG030V/8qcQDi5A3gg8Blwt43zP8qnlqs9Vil30FTutYH3d7B8 Ikhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738937295; x=1739542095; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aT5BPDOOXltaw9HQr5o8Si+JPli8HqWhNbfpXgv/A8c=; b=tVQTV1brDRw7aIaFsOEaCmFmOc12v7nem+oPHIQf3ip+Hb6Gf1YCafmeJMIyX3UfBY aNmI9bwEwZBDJl9gcQ1t9pLxPGSS2q9GaLWGc5r1y30sEBjota67UAvVQbSXiyISLkRs znc6VI0jNJ3qUqxK1Bn/igmZAMSAn94HsZrh1lGZo14E51dEmV6zgCkBzBWhMHWAeEcx jeRdyMFx/3785ADM8W2/W1pBljSB05iy3h5Z8FVEoIRsFLhP5B0aES23t638VxWWJh/I SmeNMypD/xTBtDaO0mzQvEadSMpTdu+u+TsB0xJwsz/jUEe6R51EhZSSGgFSIRkf4eRv vuPw== X-Forwarded-Encrypted: i=1; AJvYcCXIqBMbggsDgOzoNTc38/yD3tzolp+Aph0/5O0AFzGOtd6xc3Uq8YJYiw75o/TsM6DgJxlmMQZtwAASBLg=@vger.kernel.org X-Gm-Message-State: AOJu0YwtADlOokqLtK3caIkQfLCpRPiiIGQw/xFkSAc3PyNEe9Z6UPeR uNX+yMz43eb0Qe0O0VVYpOZq2oaJhXPkkMyngIQZFsxJIzE35gkQGaSi7g== X-Gm-Gg: ASbGncstNRbolXPR3QM0VoJ5jGVAvf2sknB10P431PZEIvPZuQQkBepOFulquZeKJ47 pgjydJ875mOeQeaU97idVrA43lXrCOMEo25oTFd8yKnMIaEdYaxn5hDvgE0IbmOQVsXjPtCLfr5 u1d+uoKa+xK4j9pPkAg1XrMUpZ1tAYi8P9qRpXnoN64Tq8LDtazdeVpxpEUhRz0MpclTWja7fg9 /Dm4rvBxUEyi9SzM8S7Rbcm861BbNoWXG+3itEcwDZDQsHrCm0JqcV6x8wVgEzuc104gQCE/IlZ fnuF5iva216RzILYyfCnxqo= X-Google-Smtp-Source: AGHT+IFMia48ZKw+yJcvxn7ASAFZ5gyJG5qj2eE+DWVZwXk3yRd8yXwQgF9RBmqbscVTXZlzxuXBcQ== X-Received: by 2002:a05:690c:b15:b0:6f9:75b6:bef3 with SMTP id 00721157ae682-6f9b2a081ffmr31460067b3.35.1738937295507; Fri, 07 Feb 2025 06:08:15 -0800 (PST) Received: from localhost.localdomain ([2800:bf0:82:3d2:4207:a956:ebad:2a64]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6f9a000f577sm5525607b3.118.2025.02.07.06.08.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 06:08:15 -0800 (PST) From: Kurt Borja To: platform-driver-x86@vger.kernel.org Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , "Armin Wolf" , "Mario Limonciello" , "Hans de Goede" , Dell.Client.Kernel@dell.com, linux-kernel@vger.kernel.org, "Kurt Borja" Subject: [PATCH v9 05/14] platform/x86: alienware-wmi: Refactor hdmi, amplifier, deepslp methods Date: Fri, 7 Feb 2025 09:07:34 -0500 Message-ID: <20250207140743.16822-6-kuurtb@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250207140743.16822-1-kuurtb@gmail.com> References: <20250207140743.16822-1-kuurtb@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Kurt Borja --- 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/x= 86/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_ar= gs, size_t in_size, static ssize_t cable_show(struct device *dev, struct device_attribute *att= r, char *buf) { + struct alienfx_platdata *pdata =3D dev_get_platdata(dev); struct wmax_basic_args in_args =3D { .arg =3D 0, }; - acpi_status status; u32 out_data; + int ret; =20 - status =3D - alienware_wmax_command(&in_args, sizeof(in_args), - WMAX_METHOD_HDMI_CABLE, &out_data); - if (ACPI_SUCCESS(status)) { + ret =3D alienware_wmi_command(pdata->wdev, WMAX_METHOD_HDMI_CABLE, + &in_args, sizeof(in_args), &out_data); + if (!ret) { if (out_data =3D=3D 0) return sysfs_emit(buf, "[unconnected] connected unknown\n"); else if (out_data =3D=3D 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"); } =20 static ssize_t source_show(struct device *dev, struct device_attribute *at= tr, char *buf) { + struct alienfx_platdata *pdata =3D dev_get_platdata(dev); struct wmax_basic_args in_args =3D { .arg =3D 0, }; - acpi_status status; u32 out_data; + int ret; =20 - status =3D - alienware_wmax_command(&in_args, sizeof(in_args), - WMAX_METHOD_HDMI_STATUS, &out_data); - - if (ACPI_SUCCESS(status)) { + ret =3D alienware_wmi_command(pdata->wdev, WMAX_METHOD_HDMI_STATUS, + &in_args, sizeof(in_args), &out_data); + if (!ret) { if (out_data =3D=3D 1) return sysfs_emit(buf, "[input] gpu unknown\n"); else if (out_data =3D=3D 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"); } =20 static ssize_t source_store(struct device *dev, struct device_attribute *a= ttr, const char *buf, size_t count) { + struct alienfx_platdata *pdata =3D dev_get_platdata(dev); struct wmax_basic_args args; - acpi_status status; + int ret; =20 if (strcmp(buf, "gpu\n") =3D=3D 0) args.arg =3D 1; @@ -767,12 +769,11 @@ static ssize_t source_store(struct device *dev, struc= t device_attribute *attr, args.arg =3D 3; pr_debug("alienware-wmi: setting hdmi to %d : %s", args.arg, buf); =20 - status =3D alienware_wmax_command(&args, sizeof(args), - WMAX_METHOD_HDMI_SOURCE, NULL); + ret =3D 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); =20 - if (ACPI_FAILURE(status)) - pr_err("alienware-wmi: HDMI toggle failed: results: %u\n", - status); return count; } =20 @@ -805,22 +806,23 @@ static const struct attribute_group hdmi_attribute_gr= oup =3D { static ssize_t status_show(struct device *dev, struct device_attribute *at= tr, char *buf) { + struct alienfx_platdata *pdata =3D dev_get_platdata(dev); struct wmax_basic_args in_args =3D { .arg =3D 0, }; - acpi_status status; u32 out_data; + int ret; =20 - status =3D - alienware_wmax_command(&in_args, sizeof(in_args), - WMAX_METHOD_AMPLIFIER_CABLE, &out_data); - if (ACPI_SUCCESS(status)) { + ret =3D alienware_wmi_command(pdata->wdev, WMAX_METHOD_AMPLIFIER_CABLE, + &in_args, sizeof(in_args), &out_data); + if (!ret) { if (out_data =3D=3D 0) return sysfs_emit(buf, "[unconnected] connected unknown\n"); else if (out_data =3D=3D 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"); } =20 @@ -850,15 +852,16 @@ static const struct attribute_group amplifier_attribu= te_group =3D { static ssize_t deepsleep_show(struct device *dev, struct device_attribute = *attr, char *buf) { + struct alienfx_platdata *pdata =3D dev_get_platdata(dev); struct wmax_basic_args in_args =3D { .arg =3D 0, }; - acpi_status status; u32 out_data; + int ret; =20 - status =3D alienware_wmax_command(&in_args, sizeof(in_args), - WMAX_METHOD_DEEP_SLEEP_STATUS, &out_data); - if (ACPI_SUCCESS(status)) { + ret =3D alienware_wmi_command(pdata->wdev, WMAX_METHOD_DEEP_SLEEP_STATUS, + &in_args, sizeof(in_args), &out_data); + if (!ret) { if (out_data =3D=3D 0) return sysfs_emit(buf, "[disabled] s5 s5_s4\n"); else if (out_data =3D=3D 1) @@ -866,15 +869,17 @@ static ssize_t deepsleep_show(struct device *dev, str= uct device_attribute *attr, else if (out_data =3D=3D 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"); } =20 static ssize_t deepsleep_store(struct device *dev, struct device_attribute= *attr, const char *buf, size_t count) { + struct alienfx_platdata *pdata =3D dev_get_platdata(dev); struct wmax_basic_args args; - acpi_status status; + int ret; =20 if (strcmp(buf, "disabled\n") =3D=3D 0) args.arg =3D 0; @@ -884,12 +889,11 @@ static ssize_t deepsleep_store(struct device *dev, st= ruct device_attribute *attr args.arg =3D 2; pr_debug("alienware-wmi: setting deep sleep to %d : %s", args.arg, buf); =20 - status =3D alienware_wmax_command(&args, sizeof(args), - WMAX_METHOD_DEEP_SLEEP_CONTROL, NULL); + ret =3D 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); =20 - if (ACPI_FAILURE(status)) - pr_err("alienware-wmi: deep sleep control failed: results: %u\n", - status); return count; } =20 --=20 2.48.1