microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

ACPI/ACPICA: Trivial: fix spelling mistakes and fix whitespace formatting 

Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Erik Schmauss 2019-02-15 13:36:19 -08:00 коммит произвёл Rafael J. Wysocki
Родитель 8f5a14d053
Коммит c163f90cc8
31 изменённых файлов: 72 добавлений и 70 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
drivers/acpi/acpica/aclocal.h
Просмотреть файл

@ -802,7 +802,7 @@ struct acpi_comment_addr_node {
/* /*
* File node - used for "Include" operator file stack and * File node - used for "Include" operator file stack and
* depdendency tree for the -ca option * dependency tree for the -ca option
*/ */
struct acpi_file_node { struct acpi_file_node {
void *file; void *file;

2
drivers/acpi/acpica/acmacros.h
Просмотреть файл

@ -462,7 +462,7 @@
#define ACPI_IS_OCTAL_DIGIT(d) (((char)(d) >= '0') && ((char)(d) <= '7')) #define ACPI_IS_OCTAL_DIGIT(d) (((char)(d) >= '0') && ((char)(d) <= '7'))
/* /*
* Macors used for the ASL-/ASL+ converter utility * Macros used for the ASL-/ASL+ converter utility
*/ */
#ifdef ACPI_ASL_COMPILER #ifdef ACPI_ASL_COMPILER

4
drivers/acpi/acpica/dbdisply.c
Просмотреть файл

@ -237,7 +237,7 @@ void acpi_db_decode_and_display_object(char *target, char *output_type)
default: default:
/* Is not a recognizeable object */ /* Is not a recognizable object */
acpi_os_printf acpi_os_printf
("Not a known ACPI internal object, descriptor type %2.2X\n", ("Not a known ACPI internal object, descriptor type %2.2X\n",
@ -647,7 +647,7 @@ void acpi_db_display_object_type(char *object_arg)
* *
* DESCRIPTION: Display the result of an AML opcode * DESCRIPTION: Display the result of an AML opcode
* *
* Note: Curently only displays the result object if we are single stepping. * Note: Currently only displays the result object if we are single stepping.
* However, this output may be useful in other contexts and could be enabled * However, this output may be useful in other contexts and could be enabled
* to do so if needed. * to do so if needed.
* *

2
drivers/acpi/acpica/dbnames.c
Просмотреть файл

@ -904,7 +904,7 @@ acpi_db_bus_walk(acpi_handle obj_handle,
* *
* RETURN: None * RETURN: None
* *
* DESCRIPTION: Display info about system busses. * DESCRIPTION: Display info about system buses.
* *
******************************************************************************/ ******************************************************************************/

2
drivers/acpi/acpica/dbobject.c
Просмотреть файл

@ -243,7 +243,7 @@ acpi_db_display_internal_object(union acpi_operand_object *obj_desc,
acpi_os_printf("[%s] ", acpi_os_printf("[%s] ",
acpi_ut_get_reference_name(obj_desc)); acpi_ut_get_reference_name(obj_desc));
/* Decode the refererence */ /* Decode the reference */
switch (obj_desc->reference.class) { switch (obj_desc->reference.class) {
case ACPI_REFCLASS_LOCAL: case ACPI_REFCLASS_LOCAL:

2
drivers/acpi/acpica/dswload2.c
Просмотреть файл

@ -24,7 +24,7 @@ ACPI_MODULE_NAME("dswload2")
* FUNCTION: acpi_ds_load2_begin_op * FUNCTION: acpi_ds_load2_begin_op
* *
* PARAMETERS: walk_state - Current state of the parse tree walk * PARAMETERS: walk_state - Current state of the parse tree walk
* out_op - Wher to return op if a new one is created * out_op - Where to return op if a new one is created
* *
* RETURN: Status * RETURN: Status
* *

2
drivers/acpi/acpica/evgpe.c
Просмотреть файл

@ -801,7 +801,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
dispatch.handler-> dispatch.handler->
context); context);
/* If requested, clear (if level-triggered) and reenable the GPE */ /* If requested, clear (if level-triggered) and re-enable the GPE */
if (return_value & ACPI_REENABLE_GPE) { if (return_value & ACPI_REENABLE_GPE) {
(void)acpi_ev_finish_gpe(gpe_event_info); (void)acpi_ev_finish_gpe(gpe_event_info);

2
drivers/acpi/acpica/evregion.c
Просмотреть файл

@ -250,7 +250,7 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
/* /*
* For handlers other than the default (supplied) handlers, we must * For handlers other than the default (supplied) handlers, we must
* exit the interpreter because the handler *might* block -- we don't * exit the interpreter because the handler *might* block -- we don't
* know what it will do, so we can't hold the lock on the intepreter. * know what it will do, so we can't hold the lock on the interpreter.
*/ */
acpi_ex_exit_interpreter(); acpi_ex_exit_interpreter();
} }

4
drivers/acpi/acpica/evxfgpe.c
Просмотреть файл

@ -669,9 +669,9 @@ ACPI_EXPORT_SYMBOL(acpi_dispatch_gpe)
* *
* RETURN: Status * RETURN: Status
* *
* DESCRIPTION: Clear and conditionally reenable a GPE. This completes the GPE * DESCRIPTION: Clear and conditionally re-enable a GPE. This completes the GPE
* processing. Intended for use by asynchronous host-installed * processing. Intended for use by asynchronous host-installed
* GPE handlers. The GPE is only reenabled if the enable_for_run bit * GPE handlers. The GPE is only re-enabled if the enable_for_run bit
* is set in the GPE info. * is set in the GPE info.
* *
******************************************************************************/ ******************************************************************************/

2
drivers/acpi/acpica/exconvrt.c
Просмотреть файл

@ -520,7 +520,7 @@ acpi_ex_convert_to_string(union acpi_operand_object * obj_desc,
for (i = 0; i < obj_desc->buffer.length; i++) { for (i = 0; i < obj_desc->buffer.length; i++) {
if (base == 16) { if (base == 16) {
/* Emit 0x prefix for explict/implicit hex conversion */ /* Emit 0x prefix for explicit/implicit hex conversion */
*new_buf++ = '0'; *new_buf++ = '0';
*new_buf++ = 'x'; *new_buf++ = 'x';

7
drivers/acpi/acpica/exfield.c
Просмотреть файл

@ -41,7 +41,7 @@ const u8 acpi_protocol_lengths[] = {
0xFF /* F - ATTRIB_RAW_PROCESS_BYTES */ 0xFF /* F - ATTRIB_RAW_PROCESS_BYTES */
}; };
#define PCC_MASTER_SUBSPACE 3 #define PCC_MASTER_SUBSPACE 3
/* /*
* The following macros determine a given offset is a COMD field. * The following macros determine a given offset is a COMD field.
@ -49,8 +49,8 @@ const u8 acpi_protocol_lengths[] = {
* 2-byte COMD field at offset 4 and master subspaces (type 3) contains a 4-byte * 2-byte COMD field at offset 4 and master subspaces (type 3) contains a 4-byte
* COMD field starting at offset 12. * COMD field starting at offset 12.
*/ */
#define GENERIC_SUBSPACE_COMMAND(a) (4 == a || a == 5) #define GENERIC_SUBSPACE_COMMAND(a) (4 == a || a == 5)
#define MASTER_SUBSPACE_COMMAND(a) (12 <= a && a <= 15) #define MASTER_SUBSPACE_COMMAND(a) (12 <= a && a <= 15)
/******************************************************************************* /*******************************************************************************
* *
@ -319,6 +319,7 @@ acpi_ex_write_data_to_field(union acpi_operand_object *source_desc,
memcpy(obj_desc->field.region_obj->field.internal_pcc_buffer + memcpy(obj_desc->field.region_obj->field.internal_pcc_buffer +
obj_desc->field.base_byte_offset, obj_desc->field.base_byte_offset,
source_desc->buffer.pointer, data_length); source_desc->buffer.pointer, data_length);
if ((obj_desc->field.region_obj->region.address == if ((obj_desc->field.region_obj->region.address ==
PCC_MASTER_SUBSPACE PCC_MASTER_SUBSPACE
&& MASTER_SUBSPACE_COMMAND(obj_desc->field. && MASTER_SUBSPACE_COMMAND(obj_desc->field.

2
drivers/acpi/acpica/exserial.c
Просмотреть файл

@ -21,7 +21,7 @@ ACPI_MODULE_NAME("exserial")
* FUNCTION: acpi_ex_read_gpio * FUNCTION: acpi_ex_read_gpio
* *
* PARAMETERS: obj_desc - The named field to read * PARAMETERS: obj_desc - The named field to read
* buffer - Where the return data is returnd * buffer - Where the return data is returned
* *
* RETURN: Status * RETURN: Status
* *

2
drivers/acpi/acpica/exutils.c
Просмотреть файл

@ -160,7 +160,7 @@ u8 acpi_ex_truncate_for32bit_table(union acpi_operand_object *obj_desc)
* RETURN: None * RETURN: None
* *
* DESCRIPTION: Obtain the ACPI hardware Global Lock, only if the field * DESCRIPTION: Obtain the ACPI hardware Global Lock, only if the field
* flags specifiy that it is to be obtained before field access. * flags specify that it is to be obtained before field access.
* *
******************************************************************************/ ******************************************************************************/

2
drivers/acpi/acpica/nsload.c
Просмотреть файл

@ -75,7 +75,7 @@ acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
/* /*
* On error, delete any namespace objects created by this table. * On error, delete any namespace objects created by this table.
* We cannot initialize these objects, so delete them. There are * We cannot initialize these objects, so delete them. There are
* a couple of expecially bad cases: * a couple of especially bad cases:
* AE_ALREADY_EXISTS - namespace collision. * AE_ALREADY_EXISTS - namespace collision.
* AE_NOT_FOUND - the target of a Scope operator does not * AE_NOT_FOUND - the target of a Scope operator does not
* exist. This target of Scope must already exist in the * exist. This target of Scope must already exist in the

2
drivers/acpi/acpica/nsutils.c
Просмотреть файл

@ -350,7 +350,7 @@ acpi_ns_internalize_name(const char *external_name, char **converted_name)
* *
* FUNCTION: acpi_ns_externalize_name * FUNCTION: acpi_ns_externalize_name
* *
* PARAMETERS: internal_name_length - Lenth of the internal name below * PARAMETERS: internal_name_length - Length of the internal name below
* internal_name - Internal representation of name * internal_name - Internal representation of name
* converted_name_length - Where the length is returned * converted_name_length - Where the length is returned
* converted_name - Where the resulting external name * converted_name - Where the resulting external name

14
drivers/acpi/acpica/rsdumpinfo.c
Просмотреть файл

@ -32,7 +32,7 @@ struct acpi_rsdump_info acpi_rs_dump_irq[7] = {
acpi_gbl_he_decode}, acpi_gbl_he_decode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.polarity), "Polarity", {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(irq.polarity), "Polarity",
acpi_gbl_ll_decode}, acpi_gbl_ll_decode},
{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(irq.sharable), "Sharing", {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(irq.shareable), "Sharing",
acpi_gbl_shr_decode}, acpi_gbl_shr_decode},
{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(irq.interrupt_count), {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(irq.interrupt_count),
"Interrupt Count", NULL}, "Interrupt Count", NULL},
@ -222,7 +222,7 @@ struct acpi_rsdump_info acpi_rs_dump_ext_irq[8] = {
"Triggering", acpi_gbl_he_decode}, "Triggering", acpi_gbl_he_decode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.polarity), "Polarity", {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(extended_irq.polarity), "Polarity",
acpi_gbl_ll_decode}, acpi_gbl_ll_decode},
{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(extended_irq.sharable), "Sharing", {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(extended_irq.shareable), "Sharing",
acpi_gbl_shr_decode}, acpi_gbl_shr_decode},
{ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(extended_irq.resource_source), NULL, {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET(extended_irq.resource_source), NULL,
NULL}, NULL},
@ -255,7 +255,7 @@ struct acpi_rsdump_info acpi_rs_dump_gpio[16] = {
"ProducerConsumer", acpi_gbl_consume_decode}, "ProducerConsumer", acpi_gbl_consume_decode},
{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(gpio.pin_config), "PinConfig", {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(gpio.pin_config), "PinConfig",
acpi_gbl_ppc_decode}, acpi_gbl_ppc_decode},
{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.sharable), "Sharing", {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.shareable), "Sharing",
acpi_gbl_shr_decode}, acpi_gbl_shr_decode},
{ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.io_restriction), {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET(gpio.io_restriction),
"IoRestriction", acpi_gbl_ior_decode}, "IoRestriction", acpi_gbl_ior_decode},
@ -285,7 +285,7 @@ struct acpi_rsdump_info acpi_rs_dump_pin_function[10] = {
"RevisionId", NULL}, "RevisionId", NULL},
{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(pin_function.pin_config), "PinConfig", {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(pin_function.pin_config), "PinConfig",
acpi_gbl_ppc_decode}, acpi_gbl_ppc_decode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_function.sharable), "Sharing", {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_function.shareable), "Sharing",
acpi_gbl_shr_decode}, acpi_gbl_shr_decode},
{ACPI_RSD_UINT16, ACPI_RSD_OFFSET(pin_function.function_number), {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(pin_function.function_number),
"FunctionNumber", NULL}, "FunctionNumber", NULL},
@ -308,7 +308,7 @@ struct acpi_rsdump_info acpi_rs_dump_pin_config[11] = {
NULL}, NULL},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_config.producer_consumer), {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_config.producer_consumer),
"ProducerConsumer", acpi_gbl_consume_decode}, "ProducerConsumer", acpi_gbl_consume_decode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_config.sharable), "Sharing", {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_config.shareable), "Sharing",
acpi_gbl_shr_decode}, acpi_gbl_shr_decode},
{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(pin_config.pin_config_type), {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(pin_config.pin_config_type),
"PinConfigType", NULL}, "PinConfigType", NULL},
@ -353,7 +353,7 @@ struct acpi_rsdump_info acpi_rs_dump_pin_group_function[9] = {
{ACPI_RSD_1BITFLAG, {ACPI_RSD_1BITFLAG,
ACPI_RSD_OFFSET(pin_group_function.producer_consumer), ACPI_RSD_OFFSET(pin_group_function.producer_consumer),
"ProducerConsumer", acpi_gbl_consume_decode}, "ProducerConsumer", acpi_gbl_consume_decode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_group_function.sharable), {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_group_function.shareable),
"Sharing", acpi_gbl_shr_decode}, "Sharing", acpi_gbl_shr_decode},
{ACPI_RSD_UINT16, ACPI_RSD_OFFSET(pin_group_function.function_number), {ACPI_RSD_UINT16, ACPI_RSD_OFFSET(pin_group_function.function_number),
"FunctionNumber", NULL}, "FunctionNumber", NULL},
@ -375,7 +375,7 @@ struct acpi_rsdump_info acpi_rs_dump_pin_group_config[10] = {
"RevisionId", NULL}, "RevisionId", NULL},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_group_config.producer_consumer), {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_group_config.producer_consumer),
"ProducerConsumer", acpi_gbl_consume_decode}, "ProducerConsumer", acpi_gbl_consume_decode},
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_group_config.sharable), {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET(pin_group_config.shareable),
"Sharing", acpi_gbl_shr_decode}, "Sharing", acpi_gbl_shr_decode},
{ACPI_RSD_UINT8, ACPI_RSD_OFFSET(pin_group_config.pin_config_type), {ACPI_RSD_UINT8, ACPI_RSD_OFFSET(pin_group_config.pin_config_type),
"PinConfigType", NULL}, "PinConfigType", NULL},

8
drivers/acpi/acpica/rsirq.c
Просмотреть файл

@ -54,7 +54,7 @@ struct acpi_rsconvert_info acpi_rs_get_irq[9] = {
AML_OFFSET(irq.flags), AML_OFFSET(irq.flags),
3}, 3},
{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.sharable), {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.shareable),
AML_OFFSET(irq.flags), AML_OFFSET(irq.flags),
4}, 4},
@ -92,7 +92,7 @@ struct acpi_rsconvert_info acpi_rs_set_irq[14] = {
AML_OFFSET(irq.flags), AML_OFFSET(irq.flags),
3}, 3},
{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.sharable), {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.irq.shareable),
AML_OFFSET(irq.flags), AML_OFFSET(irq.flags),
4}, 4},
@ -139,7 +139,7 @@ struct acpi_rsconvert_info acpi_rs_set_irq[14] = {
ACPI_ACTIVE_HIGH}, ACPI_ACTIVE_HIGH},
{ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_VALUE, {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_VALUE,
ACPI_RS_OFFSET(data.irq.sharable), ACPI_RS_OFFSET(data.irq.shareable),
ACPI_EXCLUSIVE}, ACPI_EXCLUSIVE},
/* We can optimize to a 2-byte irq_no_flags() descriptor */ /* We can optimize to a 2-byte irq_no_flags() descriptor */
@ -178,7 +178,7 @@ struct acpi_rsconvert_info acpi_rs_convert_ext_irq[10] = {
AML_OFFSET(extended_irq.flags), AML_OFFSET(extended_irq.flags),
2}, 2},
{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.extended_irq.sharable), {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.extended_irq.shareable),
AML_OFFSET(extended_irq.flags), AML_OFFSET(extended_irq.flags),
3}, 3},

10
drivers/acpi/acpica/rsserial.c
Просмотреть файл

@ -39,7 +39,7 @@ struct acpi_rsconvert_info acpi_rs_convert_gpio[18] = {
AML_OFFSET(gpio.flags), AML_OFFSET(gpio.flags),
0}, 0},
{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.gpio.sharable), {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.gpio.shareable),
AML_OFFSET(gpio.int_flags), AML_OFFSET(gpio.int_flags),
3}, 3},
@ -128,7 +128,7 @@ struct acpi_rsconvert_info acpi_rs_convert_pin_function[13] = {
AML_OFFSET(pin_function.revision_id), AML_OFFSET(pin_function.revision_id),
1}, 1},
{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_function.sharable), {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_function.shareable),
AML_OFFSET(pin_function.flags), AML_OFFSET(pin_function.flags),
0}, 0},
@ -518,7 +518,7 @@ struct acpi_rsconvert_info acpi_rs_convert_pin_config[14] = {
AML_OFFSET(pin_config.revision_id), AML_OFFSET(pin_config.revision_id),
1}, 1},
{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_config.sharable), {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_config.shareable),
AML_OFFSET(pin_config.flags), AML_OFFSET(pin_config.flags),
0}, 0},
@ -658,7 +658,7 @@ struct acpi_rsconvert_info acpi_rs_convert_pin_group_function[13] = {
AML_OFFSET(pin_group_function.revision_id), AML_OFFSET(pin_group_function.revision_id),
1}, 1},
{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_group_function.sharable), {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_group_function.shareable),
AML_OFFSET(pin_group_function.flags), AML_OFFSET(pin_group_function.flags),
0}, 0},
@ -735,7 +735,7 @@ struct acpi_rsconvert_info acpi_rs_convert_pin_group_config[14] = {
AML_OFFSET(pin_group_config.revision_id), AML_OFFSET(pin_group_config.revision_id),
1}, 1},
{ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_group_config.sharable), {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET(data.pin_group_config.shareable),
AML_OFFSET(pin_group_config.flags), AML_OFFSET(pin_group_config.flags),
0}, 0},

2
drivers/acpi/acpica/tbfadt.c
Просмотреть файл

@ -556,7 +556,7 @@ static void acpi_tb_convert_fadt(void)
* 64-bit X length field. * 64-bit X length field.
* Note: If the legacy length field is > 0xFF bits, ignore * Note: If the legacy length field is > 0xFF bits, ignore
* this check. (GPE registers can be larger than the * this check. (GPE registers can be larger than the
* 64-bit GAS structure can accomodate, 0xFF bits). * 64-bit GAS structure can accommodate, 0xFF bits).
*/ */
if ((ACPI_MUL_8(length) <= ACPI_UINT8_MAX) && if ((ACPI_MUL_8(length) <= ACPI_UINT8_MAX) &&
(address64->bit_width != (address64->bit_width !=

4
drivers/acpi/acpica/tbxface.c
Просмотреть файл

@ -108,7 +108,7 @@ acpi_initialize_tables(struct acpi_table_desc *initial_table_array,
/* /*
* Get the root table (RSDT or XSDT) and extract all entries to the local * Get the root table (RSDT or XSDT) and extract all entries to the local
* Root Table Array. This array contains the information of the RSDT/XSDT * Root Table Array. This array contains the information of the RSDT/XSDT
* in a common, more useable format. * in a common, more usable format.
*/ */
status = acpi_tb_parse_root_table(rsdp_address); status = acpi_tb_parse_root_table(rsdp_address);
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
@ -169,7 +169,7 @@ acpi_status ACPI_INIT_FUNCTION acpi_reallocate_root_table(void)
if (!acpi_gbl_enable_table_validation) { if (!acpi_gbl_enable_table_validation) {
/* /*
* Now it's safe to do full table validation. We can do deferred * Now it's safe to do full table validation. We can do deferred
* table initilization here once the flag is set. * table initialization here once the flag is set.
*/ */
acpi_gbl_enable_table_validation = TRUE; acpi_gbl_enable_table_validation = TRUE;
for (i = 0; i < acpi_gbl_root_table_list.current_table_count; for (i = 0; i < acpi_gbl_root_table_list.current_table_count;

4
drivers/acpi/irq.c
Просмотреть файл

@ -196,7 +196,7 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
fwnode = acpi_gsi_domain_id; fwnode = acpi_gsi_domain_id;
acpi_irq_parse_one_match(fwnode, irq->interrupts[ctx->index], acpi_irq_parse_one_match(fwnode, irq->interrupts[ctx->index],
irq->triggering, irq->polarity, irq->triggering, irq->polarity,
irq->sharable, ctx); irq->shareable, ctx);
return AE_CTRL_TERMINATE; return AE_CTRL_TERMINATE;
case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
eirq = &ares->data.extended_irq; eirq = &ares->data.extended_irq;
@ -209,7 +209,7 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
fwnode = acpi_get_irq_source_fwhandle(&eirq->resource_source); fwnode = acpi_get_irq_source_fwhandle(&eirq->resource_source);
acpi_irq_parse_one_match(fwnode, eirq->interrupts[ctx->index], acpi_irq_parse_one_match(fwnode, eirq->interrupts[ctx->index],
eirq->triggering, eirq->polarity, eirq->triggering, eirq->polarity,
eirq->sharable, ctx); eirq->shareable, ctx);
return AE_CTRL_TERMINATE; return AE_CTRL_TERMINATE;
} }

8
drivers/acpi/pci_link.c
Просмотреть файл

@ -317,10 +317,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
resource->res.data.irq.polarity = resource->res.data.irq.polarity =
link->irq.polarity; link->irq.polarity;
if (link->irq.triggering == ACPI_EDGE_SENSITIVE) if (link->irq.triggering == ACPI_EDGE_SENSITIVE)
resource->res.data.irq.sharable = resource->res.data.irq.shareable =
ACPI_EXCLUSIVE; ACPI_EXCLUSIVE;
else else
resource->res.data.irq.sharable = ACPI_SHARED; resource->res.data.irq.shareable = ACPI_SHARED;
resource->res.data.irq.interrupt_count = 1; resource->res.data.irq.interrupt_count = 1;
resource->res.data.irq.interrupts[0] = irq; resource->res.data.irq.interrupts[0] = irq;
break; break;
@ -335,10 +335,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
resource->res.data.extended_irq.polarity = resource->res.data.extended_irq.polarity =
link->irq.polarity; link->irq.polarity;
if (link->irq.triggering == ACPI_EDGE_SENSITIVE) if (link->irq.triggering == ACPI_EDGE_SENSITIVE)
resource->res.data.irq.sharable = resource->res.data.irq.shareable =
ACPI_EXCLUSIVE; ACPI_EXCLUSIVE;
else else
resource->res.data.irq.sharable = ACPI_SHARED; resource->res.data.irq.shareable = ACPI_SHARED;
resource->res.data.extended_irq.interrupt_count = 1; resource->res.data.extended_irq.interrupt_count = 1;
resource->res.data.extended_irq.interrupts[0] = irq; resource->res.data.extended_irq.interrupts[0] = irq;
/* ignore resource_source, it's optional */ /* ignore resource_source, it's optional */

4
drivers/acpi/resource.c
Просмотреть файл

@ -476,7 +476,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,
} }
acpi_dev_get_irqresource(res, irq->interrupts[index], acpi_dev_get_irqresource(res, irq->interrupts[index],
irq->triggering, irq->polarity, irq->triggering, irq->polarity,
irq->sharable, true); irq->shareable, true);
break; break;
case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
ext_irq = &ares->data.extended_irq; ext_irq = &ares->data.extended_irq;
@ -487,7 +487,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,
if (is_gsi(ext_irq)) if (is_gsi(ext_irq))
acpi_dev_get_irqresource(res, ext_irq->interrupts[index], acpi_dev_get_irqresource(res, ext_irq->interrupts[index],
ext_irq->triggering, ext_irq->polarity, ext_irq->triggering, ext_irq->polarity,
ext_irq->sharable, false); ext_irq->shareable, false);
else else
acpi_dev_irqresource_disabled(res, 0); acpi_dev_irqresource_disabled(res, 0);
break; break;

2
drivers/gpio/gpiolib-acpi.c
Просмотреть файл

@ -897,7 +897,7 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,
* event but only if the access here is ACPI_READ. In that * event but only if the access here is ACPI_READ. In that
* case we "borrow" the event GPIO instead. * case we "borrow" the event GPIO instead.
*/ */
if (!found && agpio->sharable == ACPI_SHARED && if (!found && agpio->shareable == ACPI_SHARED &&
function == ACPI_READ) { function == ACPI_READ) {
struct acpi_gpio_event *event; struct acpi_gpio_event *event;

8
drivers/platform/x86/sony-laptop.c
Просмотреть файл

@ -4392,7 +4392,7 @@ sony_pic_read_possible_resource(struct acpi_resource *resource, void *context)
list_add(&interrupt->list, &dev->interrupts); list_add(&interrupt->list, &dev->interrupts);
interrupt->irq.triggering = p->triggering; interrupt->irq.triggering = p->triggering;
interrupt->irq.polarity = p->polarity; interrupt->irq.polarity = p->polarity;
interrupt->irq.sharable = p->sharable; interrupt->irq.shareable = p->shareable;
interrupt->irq.interrupt_count = 1; interrupt->irq.interrupt_count = 1;
interrupt->irq.interrupts[0] = p->interrupts[i]; interrupt->irq.interrupts[0] = p->interrupts[i];
} }
@ -4546,7 +4546,7 @@ static int sony_pic_enable(struct acpi_device *device,
memcpy(&resource->res3.data.irq, &irq->irq, memcpy(&resource->res3.data.irq, &irq->irq,
sizeof(struct acpi_resource_irq)); sizeof(struct acpi_resource_irq));
/* we requested a shared irq */ /* we requested a shared irq */
resource->res3.data.irq.sharable = ACPI_SHARED; resource->res3.data.irq.shareable = ACPI_SHARED;
resource->res4.type = ACPI_RESOURCE_TYPE_END_TAG; resource->res4.type = ACPI_RESOURCE_TYPE_END_TAG;
resource->res4.length = sizeof(struct acpi_resource); resource->res4.length = sizeof(struct acpi_resource);
@ -4565,7 +4565,7 @@ static int sony_pic_enable(struct acpi_device *device,
memcpy(&resource->res2.data.irq, &irq->irq, memcpy(&resource->res2.data.irq, &irq->irq,
sizeof(struct acpi_resource_irq)); sizeof(struct acpi_resource_irq));
/* we requested a shared irq */ /* we requested a shared irq */
resource->res2.data.irq.sharable = ACPI_SHARED; resource->res2.data.irq.shareable = ACPI_SHARED;
resource->res3.type = ACPI_RESOURCE_TYPE_END_TAG; resource->res3.type = ACPI_RESOURCE_TYPE_END_TAG;
resource->res3.length = sizeof(struct acpi_resource); resource->res3.length = sizeof(struct acpi_resource);
@ -4779,7 +4779,7 @@ static int sony_pic_add(struct acpi_device *device)
irq->irq.interrupts[0], irq->irq.interrupts[0],
irq->irq.triggering, irq->irq.triggering,
irq->irq.polarity, irq->irq.polarity,
irq->irq.sharable); irq->irq.shareable);
spic_dev.cur_irq = irq; spic_dev.cur_irq = irq;
break; break;
} }

14
drivers/pnp/pnpacpi/rsparser.c
Просмотреть файл

@ -215,7 +215,7 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
if (i >= 0) { if (i >= 0) {
flags = acpi_dev_irq_flags(gpio->triggering, flags = acpi_dev_irq_flags(gpio->triggering,
gpio->polarity, gpio->polarity,
gpio->sharable); gpio->shareable);
} else { } else {
flags = IORESOURCE_DISABLED; flags = IORESOURCE_DISABLED;
} }
@ -324,7 +324,7 @@ static __init void pnpacpi_parse_irq_option(struct pnp_dev *dev,
if (p->interrupts[i]) if (p->interrupts[i])
__set_bit(p->interrupts[i], map.bits); __set_bit(p->interrupts[i], map.bits);
flags = acpi_dev_irq_flags(p->triggering, p->polarity, p->sharable); flags = acpi_dev_irq_flags(p->triggering, p->polarity, p->shareable);
pnp_register_irq_resource(dev, option_flags, &map, flags); pnp_register_irq_resource(dev, option_flags, &map, flags);
} }
@ -348,7 +348,7 @@ static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev,
} }
} }
flags = acpi_dev_irq_flags(p->triggering, p->polarity, p->sharable); flags = acpi_dev_irq_flags(p->triggering, p->polarity, p->shareable);
pnp_register_irq_resource(dev, option_flags, &map, flags); pnp_register_irq_resource(dev, option_flags, &map, flags);
} }
@ -681,7 +681,7 @@ static void pnpacpi_encode_irq(struct pnp_dev *dev,
decode_irq_flags(dev, p->flags, &triggering, &polarity, &shareable); decode_irq_flags(dev, p->flags, &triggering, &polarity, &shareable);
irq->triggering = triggering; irq->triggering = triggering;
irq->polarity = polarity; irq->polarity = polarity;
irq->sharable = shareable; irq->shareable = shareable;
irq->interrupt_count = 1; irq->interrupt_count = 1;
irq->interrupts[0] = p->start; irq->interrupts[0] = p->start;
@ -689,7 +689,7 @@ static void pnpacpi_encode_irq(struct pnp_dev *dev,
(int) p->start, (int) p->start,
triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge", triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge",
polarity == ACPI_ACTIVE_LOW ? "low" : "high", polarity == ACPI_ACTIVE_LOW ? "low" : "high",
irq->sharable == ACPI_SHARED ? "shared" : "exclusive", irq->shareable == ACPI_SHARED ? "shared" : "exclusive",
irq->descriptor_length); irq->descriptor_length);
} }
@ -711,14 +711,14 @@ static void pnpacpi_encode_ext_irq(struct pnp_dev *dev,
extended_irq->producer_consumer = ACPI_CONSUMER; extended_irq->producer_consumer = ACPI_CONSUMER;
extended_irq->triggering = triggering; extended_irq->triggering = triggering;
extended_irq->polarity = polarity; extended_irq->polarity = polarity;
extended_irq->sharable = shareable; extended_irq->shareable = shareable;
extended_irq->interrupt_count = 1; extended_irq->interrupt_count = 1;
extended_irq->interrupts[0] = p->start; extended_irq->interrupts[0] = p->start;
pnp_dbg(&dev->dev, " encode irq %d %s %s %s\n", (int) p->start, pnp_dbg(&dev->dev, " encode irq %d %s %s %s\n", (int) p->start,
triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge", triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge",
polarity == ACPI_ACTIVE_LOW ? "low" : "high", polarity == ACPI_ACTIVE_LOW ? "low" : "high",
extended_irq->sharable == ACPI_SHARED ? "shared" : "exclusive"); extended_irq->shareable == ACPI_SHARED ? "shared" : "exclusive");
} }
static void pnpacpi_encode_dma(struct pnp_dev *dev, static void pnpacpi_encode_dma(struct pnp_dev *dev,

2
include/acpi/acconfig.h
Просмотреть файл

@ -141,7 +141,7 @@
/* /*
* Maximal number of elements the Result Stack can contain, * Maximal number of elements the Result Stack can contain,
* it may be an arbitray value not exceeding the types of * it may be an arbitrary value not exceeding the types of
* result_size and result_count (now u8). * result_size and result_count (now u8).
*/ */
#define ACPI_RESULTS_OBJ_NUM_MAX 255 #define ACPI_RESULTS_OBJ_NUM_MAX 255

3
include/acpi/acexcep.h
Просмотреть файл

@ -311,7 +311,8 @@ static const struct acpi_exception_info acpi_gbl_exception_names_aml[] = {
"An ACPI name contains invalid character(s)"), "An ACPI name contains invalid character(s)"),
EXCEP_TXT("AE_AML_NAME_NOT_FOUND", EXCEP_TXT("AE_AML_NAME_NOT_FOUND",
"Could not resolve a named reference"), "Could not resolve a named reference"),
EXCEP_TXT("AE_AML_INTERNAL", "An internal error within the interprete"), EXCEP_TXT("AE_AML_INTERNAL",
"An internal error within the interpreter"),
EXCEP_TXT("AE_AML_INVALID_SPACE_ID", EXCEP_TXT("AE_AML_INVALID_SPACE_ID",
"An Operation Region SpaceID is invalid"), "An Operation Region SpaceID is invalid"),
EXCEP_TXT("AE_AML_STRING_LIMIT", EXCEP_TXT("AE_AML_STRING_LIMIT",

14
include/acpi/acrestyp.h
Просмотреть файл

@ -139,7 +139,7 @@ struct acpi_resource_irq {
u8 descriptor_length; u8 descriptor_length;
u8 triggering; u8 triggering;
u8 polarity; u8 polarity;
u8 sharable; u8 shareable;
u8 wake_capable; u8 wake_capable;
u8 interrupt_count; u8 interrupt_count;
u8 interrupts[1]; u8 interrupts[1];
@ -328,7 +328,7 @@ struct acpi_resource_extended_irq {
u8 producer_consumer; u8 producer_consumer;
u8 triggering; u8 triggering;
u8 polarity; u8 polarity;
u8 sharable; u8 shareable;
u8 wake_capable; u8 wake_capable;
u8 interrupt_count; u8 interrupt_count;
struct acpi_resource_source resource_source; struct acpi_resource_source resource_source;
@ -348,7 +348,7 @@ struct acpi_resource_gpio {
u8 connection_type; u8 connection_type;
u8 producer_consumer; /* For values, see Producer/Consumer above */ u8 producer_consumer; /* For values, see Producer/Consumer above */
u8 pin_config; u8 pin_config;
u8 sharable; /* For values, see Interrupt Attributes above */ u8 shareable; /* For values, see Interrupt Attributes above */
u8 wake_capable; /* For values, see Interrupt Attributes above */ u8 wake_capable; /* For values, see Interrupt Attributes above */
u8 io_restriction; u8 io_restriction;
u8 triggering; /* For values, see Interrupt Attributes above */ u8 triggering; /* For values, see Interrupt Attributes above */
@ -508,7 +508,7 @@ struct acpi_resource_uart_serialbus {
struct acpi_resource_pin_function { struct acpi_resource_pin_function {
u8 revision_id; u8 revision_id;
u8 pin_config; u8 pin_config;
u8 sharable; /* For values, see Interrupt Attributes above */ u8 shareable; /* For values, see Interrupt Attributes above */
u16 function_number; u16 function_number;
u16 pin_table_length; u16 pin_table_length;
u16 vendor_length; u16 vendor_length;
@ -520,7 +520,7 @@ struct acpi_resource_pin_function {
struct acpi_resource_pin_config { struct acpi_resource_pin_config {
u8 revision_id; u8 revision_id;
u8 producer_consumer; /* For values, see Producer/Consumer above */ u8 producer_consumer; /* For values, see Producer/Consumer above */
u8 sharable; /* For values, see Interrupt Attributes above */ u8 shareable; /* For values, see Interrupt Attributes above */
u8 pin_config_type; u8 pin_config_type;
u32 pin_config_value; u32 pin_config_value;
u16 pin_table_length; u16 pin_table_length;
@ -560,7 +560,7 @@ struct acpi_resource_pin_group {
struct acpi_resource_pin_group_function { struct acpi_resource_pin_group_function {
u8 revision_id; u8 revision_id;
u8 producer_consumer; /* For values, see Producer/Consumer above */ u8 producer_consumer; /* For values, see Producer/Consumer above */
u8 sharable; /* For values, see Interrupt Attributes above */ u8 shareable; /* For values, see Interrupt Attributes above */
u16 function_number; u16 function_number;
u16 vendor_length; u16 vendor_length;
struct acpi_resource_source resource_source; struct acpi_resource_source resource_source;
@ -571,7 +571,7 @@ struct acpi_resource_pin_group_function {
struct acpi_resource_pin_group_config { struct acpi_resource_pin_group_config {
u8 revision_id; u8 revision_id;
u8 producer_consumer; /* For values, see Producer/Consumer above */ u8 producer_consumer; /* For values, see Producer/Consumer above */
u8 sharable; /* For values, see Interrupt Attributes above */ u8 shareable; /* For values, see Interrupt Attributes above */
u8 pin_config_type; /* For values, see pin_config_type above */ u8 pin_config_type; /* For values, see pin_config_type above */
u32 pin_config_value; u32 pin_config_value;
u16 vendor_length; u16 vendor_length;

4
include/acpi/actbl1.h
Просмотреть файл

@ -562,7 +562,7 @@ struct acpi_dmar_hardware_unit {
#define ACPI_DMAR_INCLUDE_ALL (1) #define ACPI_DMAR_INCLUDE_ALL (1)
/* 1: Reserved Memory Defininition */ /* 1: Reserved Memory Definition */
struct acpi_dmar_reserved_memory { struct acpi_dmar_reserved_memory {
struct acpi_dmar_header header; struct acpi_dmar_header header;
@ -1395,7 +1395,7 @@ struct acpi_table_hmat {
/* Values for HMAT structure types */ /* Values for HMAT structure types */
enum acpi_hmat_type { enum acpi_hmat_type {
ACPI_HMAT_TYPE_ADDRESS_RANGE = 0, /* Memory subystem address range */ ACPI_HMAT_TYPE_ADDRESS_RANGE = 0, /* Memory subsystem address range */
ACPI_HMAT_TYPE_LOCALITY = 1, /* System locality latency and bandwidth information */ ACPI_HMAT_TYPE_LOCALITY = 1, /* System locality latency and bandwidth information */
ACPI_HMAT_TYPE_CACHE = 2, /* Memory side cache information */ ACPI_HMAT_TYPE_CACHE = 2, /* Memory side cache information */
ACPI_HMAT_TYPE_RESERVED = 3 /* 3 and greater are reserved */ ACPI_HMAT_TYPE_RESERVED = 3 /* 3 and greater are reserved */

2
include/acpi/actbl2.h
Просмотреть файл

@ -143,7 +143,7 @@ struct acpi_iort_memory_access {
*/ */
struct acpi_iort_its_group { struct acpi_iort_its_group {
u32 its_count; u32 its_count;
u32 identifiers[1]; /* GIC ITS identifier arrary */ u32 identifiers[1]; /* GIC ITS identifier array */
}; };
struct acpi_iort_named_component { struct acpi_iort_named_component {