Skip to content

Commit

Permalink
Merge back ACPICA material for v5.12.
Browse files Browse the repository at this point in the history
  • Loading branch information
Rafael J. Wysocki committed Feb 10, 2021
2 parents fe0af09 + df1d4b4 commit 938bdd1
Show file tree
Hide file tree
Showing 178 changed files with 221 additions and 249 deletions.
4 changes: 2 additions & 2 deletions drivers/acpi/acpica/acapps.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: acapps - common include for ACPI applications/tools
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand All @@ -17,7 +17,7 @@
/* Common info for tool signons */

#define ACPICA_NAME "Intel ACPI Component Architecture"
#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2020 Intel Corporation"
#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2021 Intel Corporation"

#if ACPI_MACHINE_WIDTH == 64
#define ACPI_WIDTH " (64-bit version)"
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/accommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: accommon.h - Common include files for generation of ACPICA source
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acconvert.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: acapps - common include for ACPI applications/tools
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acdebug.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acdebug.h - ACPI/AML debugger
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acdispat.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acdispat.h - dispatcher (parser to interpreter interface)
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acevents.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acevents.h - Event subcomponent prototypes and defines
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acglobal.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acglobal.h - Declarations for global variables
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/achware.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: achware.h -- hardware specific interfaces
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acinterp.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acinterp.h - Interpreter subcomponent prototypes and defines
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/aclocal.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: aclocal.h - Internal data types used across the ACPI subsystem
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acmacros.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acmacros.h - C macros for the entire subsystem.
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acnamesp.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acnamesp.h - Namespace subcomponent prototypes and defines
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acobject.h - Definition of union acpi_operand_object (Internal object only)
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acopcode.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acopcode.h - AML opcode information for the AML parser and interpreter
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acparser.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: acparser.h - AML Parser subcomponent prototypes and defines
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acpredef.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acpredef - Information table for ACPI predefined methods and objects
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acresrc.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acresrc.h - Resource Manager function prototypes
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acstruct.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acstruct.h - Internal structs
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/actables.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: actables.h - ACPI table management
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/acutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Name: acutils.h -- prototypes for the common (subsystem-wide) procedures
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/amlcode.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* Declarations and definitions contained herein are derived
* directly from the ACPI specification.
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/amlresrc.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: amlresrc.h - AML resource descriptors
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/dbhistry.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: dbhistry - debugger HISTORY command
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
4 changes: 2 additions & 2 deletions drivers/acpi/acpica/dbinput.c
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ char *acpi_db_get_next_token(char *string,

/* Remove any spaces at the beginning, ignore blank lines */

while (*string && isspace(*string)) {
while (*string && isspace((int)*string)) {
string++;
}

Expand Down Expand Up @@ -571,7 +571,7 @@ char *acpi_db_get_next_token(char *string,

/* Find end of token */

while (*string && !isspace(*string)) {
while (*string && !isspace((int)*string)) {
string++;
}
break;
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/dbobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ acpi_db_dump_method_info(acpi_status status, struct acpi_walk_state *walk_state)

/* Ignore control codes, they are not errors */

if ((status & AE_CODE_MASK) == AE_CODE_CONTROL) {
if (ACPI_CNTL_EXCEPTION(status)) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/dsargs.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Module Name: dsargs - Support for execution of dynamic arguments for static
* objects (regions, fields, buffer fields, etc.)
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
4 changes: 2 additions & 2 deletions drivers/acpi/acpica/dscontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Module Name: dscontrol - Support for execution control opcodes -
* if/else/while/return
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down Expand Up @@ -62,7 +62,7 @@ acpi_ds_exec_begin_control_op(struct acpi_walk_state *walk_state,
}
}

/*lint -fallthrough */
ACPI_FALLTHROUGH;

case AML_IF_OP:
/*
Expand Down
4 changes: 2 additions & 2 deletions drivers/acpi/acpica/dsdebug.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: dsdebug - Parser/Interpreter interface - debugging
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down Expand Up @@ -100,7 +100,7 @@ acpi_ds_dump_method_stack(acpi_status status,

/* Ignore control codes, they are not errors */

if ((status & AE_CODE_MASK) == AE_CODE_CONTROL) {
if (ACPI_CNTL_EXCEPTION(status)) {
return_VOID;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/dsfield.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: dsfield - Dispatcher field routines
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/dsinit.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: dsinit - Object initialization namespace walk
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/dsmethod.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: dsmethod - Parser/Interpreter interface - control method parsing
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/dsobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: dsobject - Dispatcher object management routines
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/dsopcode.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: dsopcode - Dispatcher support for regions and fields
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/dspkginit.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: dspkginit - Completion of deferred package initialization
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down
5 changes: 2 additions & 3 deletions drivers/acpi/acpica/dswexec.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Module Name: dswexec - Dispatcher method execution callbacks;
* dispatch to interpreter.
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down Expand Up @@ -598,8 +598,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
break;
}

/* Fall through */
/*lint -fallthrough */
ACPI_FALLTHROUGH;

case AML_INT_EVAL_SUBTREE_OP:

Expand Down
4 changes: 2 additions & 2 deletions drivers/acpi/acpica/dswload.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: dswload - Dispatcher first pass namespace load callbacks
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down Expand Up @@ -224,7 +224,7 @@ acpi_ds_load1_begin_op(struct acpi_walk_state *walk_state,
break;
}

/*lint -fallthrough */
ACPI_FALLTHROUGH;

default:

Expand Down
4 changes: 2 additions & 2 deletions drivers/acpi/acpica/dswload2.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* Module Name: dswload2 - Dispatcher second pass namespace load callbacks
*
* Copyright (C) 2000 - 2020, Intel Corp.
* Copyright (C) 2000 - 2021, Intel Corp.
*
*****************************************************************************/

Expand Down Expand Up @@ -214,7 +214,7 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
break;
}

/*lint -fallthrough */
ACPI_FALLTHROUGH;

default:

Expand Down
Loading

0 comments on commit 938bdd1

Please sign in to comment.