The return_object_type field in `struct acpi_evaluate_info` is unused,
so remove it.
There are also some issues in the comments of acpi_ps_execute_method().
First, the parameter_type field has already been removed from
`struct acpi_evaluate_info`, so the corresponding field description in
the comments should also be removed. Second, the return_object field
description in the comments is duplicated. Remove these incorrect comments.
Signed-off-by: Yuntao Wang <[email protected]>
---
drivers/acpi/acpica/acstruct.h | 1 -
drivers/acpi/acpica/psxface.c | 3 ---
2 files changed, 4 deletions(-)
diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
index f8fee94ba708..fe57c3a16e59 100644
--- a/drivers/acpi/acpica/acstruct.h
+++ b/drivers/acpi/acpica/acstruct.h
@@ -169,7 +169,6 @@ struct acpi_evaluate_info {
u16 param_count; /* Count of the input argument list */
u16 node_flags; /* Same as Node->Flags */
u8 pass_number; /* Parser pass number */
- u8 return_object_type; /* Object type of the returned object */
u8 flags; /* General flags */
};
diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
index 6f4eace0ba69..df5679bbc510 100644
--- a/drivers/acpi/acpica/psxface.c
+++ b/drivers/acpi/acpica/psxface.c
@@ -70,9 +70,6 @@ acpi_debug_trace(const char *name, u32 debug_level, u32 debug_layer, u32 flags)
* NULL if no parameters are being passed.
* return_object - Where to put method's return value (if
* any). If NULL, no value is returned.
- * parameter_type - Type of Parameter list
- * return_object - Where to put method's return value (if
- * any). If NULL, no value is returned.
* pass_number - Parse or execute pass
*
* RETURN: Status
--
2.43.0
On Mon, Nov 27, 2023 at 6:59 AM Yuntao Wang <[email protected]> wrote:
>
> The return_object_type field in `struct acpi_evaluate_info` is unused,
> so remove it.
>
> There are also some issues in the comments of acpi_ps_execute_method().
> First, the parameter_type field has already been removed from
> `struct acpi_evaluate_info`, so the corresponding field description in
> the comments should also be removed. Second, the return_object field
> description in the comments is duplicated. Remove these incorrect comments.
>
> Signed-off-by: Yuntao Wang <[email protected]>
> ---
> drivers/acpi/acpica/acstruct.h | 1 -
> drivers/acpi/acpica/psxface.c | 3 ---
> 2 files changed, 4 deletions(-)
This is ACPICA code which comes from a separate project.
The way to change it is to submit a pull request with the desired change
to the upstream ACPICA project on GitHub and add a Link tag pointing
to the upstream PR to the corresponding Linux patch. Then, the Linux
patch can only be applied after the corresponding upstream PR has been
merged.
Thanks!
> diff --git a/drivers/acpi/acpica/acstruct.h b/drivers/acpi/acpica/acstruct.h
> index f8fee94ba708..fe57c3a16e59 100644
> --- a/drivers/acpi/acpica/acstruct.h
> +++ b/drivers/acpi/acpica/acstruct.h
> @@ -169,7 +169,6 @@ struct acpi_evaluate_info {
> u16 param_count; /* Count of the input argument list */
> u16 node_flags; /* Same as Node->Flags */
> u8 pass_number; /* Parser pass number */
> - u8 return_object_type; /* Object type of the returned object */
> u8 flags; /* General flags */
> };
>
> diff --git a/drivers/acpi/acpica/psxface.c b/drivers/acpi/acpica/psxface.c
> index 6f4eace0ba69..df5679bbc510 100644
> --- a/drivers/acpi/acpica/psxface.c
> +++ b/drivers/acpi/acpica/psxface.c
> @@ -70,9 +70,6 @@ acpi_debug_trace(const char *name, u32 debug_level, u32 debug_layer, u32 flags)
> * NULL if no parameters are being passed.
> * return_object - Where to put method's return value (if
> * any). If NULL, no value is returned.
> - * parameter_type - Type of Parameter list
> - * return_object - Where to put method's return value (if
> - * any). If NULL, no value is returned.
> * pass_number - Parse or execute pass
> *
> * RETURN: Status
> --
> 2.43.0
>
>