HID: intel-thc-hid: intel-quicki2c: pass correct arguments to acpi_evaluate_object

[PATCH] HID: intel-thc-hid: intel-quicki2c: pass correct arguments to acpi_evaluate_object

Posted by WangYuli 8 months ago

From: Wentao Guan <guanwentao@uniontech.com>

Delete unused argument, pass correct argument to acpi_evaluate_object.

Log:
  intel_quicki2c 0000:00:10.0: enabling device (0000 -> 0002)
  ACPI: \_SB.PC00.THC0.ICRS: 1 arguments were passed to a non-method ACPI object (Buffer) (20230628/nsarguments-211)
  ACPI: \_SB.PC00.THC0.ISUB: 1 arguments were passed to a non-method ACPI object (Buffer) (20230628/nsarguments-211)

Fixes: 5282e45ccbfa ("HID: intel-thc-hid: intel-quicki2c: Add THC QuickI2C ACPI interfaces")
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Signed-off-by: WangYuli <wangyuli@uniontech.com>
---
 drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c b/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
index fa51155ebe39..8a8c4a46f927 100644
--- a/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
+++ b/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
@@ -82,15 +82,10 @@ static int quicki2c_acpi_get_dsd_property(struct acpi_device *adev, acpi_string
 {
 	acpi_handle handle = acpi_device_handle(adev);
 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-	union acpi_object obj = { .type = type };
-	struct acpi_object_list arg_list = {
-		.count = 1,
-		.pointer = &obj,
-	};
 	union acpi_object *ret_obj;
 	acpi_status status;
 
-	status = acpi_evaluate_object(handle, dsd_method_name, &arg_list, &buffer);
+	status = acpi_evaluate_object(handle, dsd_method_name, NULL, &buffer);
 	if (ACPI_FAILURE(status)) {
 		acpi_handle_err(handle,
 				"Can't evaluate %s method: %d\n", dsd_method_name, status);
-- 
2.49.0

Re: [PATCH] HID: intel-thc-hid: intel-quicki2c: pass correct arguments to acpi_evaluate_object

Posted by Jiri Kosina 7 months, 3 weeks ago

On Thu, 17 Apr 2025, WangYuli wrote:

> From: Wentao Guan <guanwentao@uniontech.com>
> 
> Delete unused argument, pass correct argument to acpi_evaluate_object.
> 
> Log:
>   intel_quicki2c 0000:00:10.0: enabling device (0000 -> 0002)
>   ACPI: \_SB.PC00.THC0.ICRS: 1 arguments were passed to a non-method ACPI object (Buffer) (20230628/nsarguments-211)
>   ACPI: \_SB.PC00.THC0.ISUB: 1 arguments were passed to a non-method ACPI object (Buffer) (20230628/nsarguments-211)
> 
> Fixes: 5282e45ccbfa ("HID: intel-thc-hid: intel-quicki2c: Add THC QuickI2C ACPI interfaces")
> Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
> Signed-off-by: WangYuli <wangyuli@uniontech.com>
> ---
>  drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c b/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
> index fa51155ebe39..8a8c4a46f927 100644
> --- a/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
> +++ b/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
> @@ -82,15 +82,10 @@ static int quicki2c_acpi_get_dsd_property(struct acpi_device *adev, acpi_string
>  {
>  	acpi_handle handle = acpi_device_handle(adev);
>  	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
> -	union acpi_object obj = { .type = type };
> -	struct acpi_object_list arg_list = {
> -		.count = 1,
> -		.pointer = &obj,
> -	};
>  	union acpi_object *ret_obj;
>  	acpi_status status;
>  
> -	status = acpi_evaluate_object(handle, dsd_method_name, &arg_list, &buffer);
> +	status = acpi_evaluate_object(handle, dsd_method_name, NULL, &buffer);
>  	if (ACPI_FAILURE(status)) {
>  		acpi_handle_err(handle,
>  				"Can't evaluate %s method: %d\n", dsd_method_name, status);

Applied, thanks.

-- 
Jiri Kosina
SUSE Labs

RE: [PATCH] HID: intel-thc-hid: intel-quicki2c: pass correct arguments to acpi_evaluate_object

Posted by Xu, Even 8 months ago


> -----Original Message-----
> From: WangYuli <wangyuli@uniontech.com>
> Sent: Thursday, April 17, 2025 9:50 PM
> To: Xu, Even <even.xu@intel.com>; Sun, Xinpeng <xinpeng.sun@intel.com>;
> jikos@kernel.org; bentiss@kernel.org
> Cc: mpearson-lenovo@squebb.ca; srinivas.pandruvada@linux.intel.com;
> guanwentao@uniontech.com; phasta@kernel.org; linux-input@vger.kernel.org;
> linux-kernel@vger.kernel.org; zhanjun@uniontech.com;
> niecheng1@uniontech.com; WangYuli <wangyuli@uniontech.com>
> Subject: [PATCH] HID: intel-thc-hid: intel-quicki2c: pass correct arguments to
> acpi_evaluate_object
> 
> From: Wentao Guan <guanwentao@uniontech.com>
> 
> Delete unused argument, pass correct argument to acpi_evaluate_object.
> 
> Log:
>   intel_quicki2c 0000:00:10.0: enabling device (0000 -> 0002)
>   ACPI: \_SB.PC00.THC0.ICRS: 1 arguments were passed to a non-method ACPI
> object (Buffer) (20230628/nsarguments-211)
>   ACPI: \_SB.PC00.THC0.ISUB: 1 arguments were passed to a non-method ACPI
> object (Buffer) (20230628/nsarguments-211)
> 
> Fixes: 5282e45ccbfa ("HID: intel-thc-hid: intel-quicki2c: Add THC QuickI2C ACPI
> interfaces")
> Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
> Signed-off-by: WangYuli <wangyuli@uniontech.com>
> ---
>  drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
> b/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
> index fa51155ebe39..8a8c4a46f927 100644
> --- a/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
> +++ b/drivers/hid/intel-thc-hid/intel-quicki2c/pci-quicki2c.c
> @@ -82,15 +82,10 @@ static int quicki2c_acpi_get_dsd_property(struct
> acpi_device *adev, acpi_string  {
>  	acpi_handle handle = acpi_device_handle(adev);
>  	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
> -	union acpi_object obj = { .type = type };
> -	struct acpi_object_list arg_list = {
> -		.count = 1,
> -		.pointer = &obj,
> -	};
>  	union acpi_object *ret_obj;
>  	acpi_status status;
> 
> -	status = acpi_evaluate_object(handle, dsd_method_name, &arg_list,
> &buffer);
> +	status = acpi_evaluate_object(handle, dsd_method_name, NULL,
> &buffer);

Just tested this patch, it works.
Thanks for the fix!

Reviewed-by: Even Xu <even.xu@intel.com>

>  	if (ACPI_FAILURE(status)) {
>  		acpi_handle_err(handle,
>  				"Can't evaluate %s method: %d\n",
> dsd_method_name, status);
> --
> 2.49.0