projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'clk-fixes' into clk-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
acpi
/
acpica
/
tbxface.c
diff --git
a/drivers/acpi/acpica/tbxface.c
b/drivers/acpi/acpica/tbxface.c
index 60e94f87f27aeea917c9705358ea4675666363d9..5559e2c70b15634384fa907b1934d1df4c97bdf3 100644
(file)
--- a/
drivers/acpi/acpica/tbxface.c
+++ b/
drivers/acpi/acpica/tbxface.c
@@
-119,9
+119,9
@@
acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
} else {
/* Root Table Array has been statically allocated by the host */
} else {
/* Root Table Array has been statically allocated by the host */
-
ACPI_MEMSET
(initial_table_array, 0,
-
(acpi_size) initial_table_count *
-
sizeof(struct acpi_table_desc));
+
memset
(initial_table_array, 0,
+ (acpi_size) initial_table_count *
+ sizeof(struct acpi_table_desc));
acpi_gbl_root_table_list.tables = initial_table_array;
acpi_gbl_root_table_list.max_table_count = initial_table_count;
acpi_gbl_root_table_list.tables = initial_table_array;
acpi_gbl_root_table_list.max_table_count = initial_table_count;
@@
-242,8
+242,9
@@
acpi_get_table_header(char *signature,
if (!header) {
return (AE_NO_MEMORY);
}
if (!header) {
return (AE_NO_MEMORY);
}
- ACPI_MEMCPY(out_table_header, header,
- sizeof(struct acpi_table_header));
+
+ memcpy(out_table_header, header,
+ sizeof(struct acpi_table_header));
acpi_os_unmap_memory(header,
sizeof(struct
acpi_table_header));
acpi_os_unmap_memory(header,
sizeof(struct
acpi_table_header));
@@
-251,9
+252,9
@@
acpi_get_table_header(char *signature,
return (AE_NOT_FOUND);
}
} else {
return (AE_NOT_FOUND);
}
} else {
-
ACPI_MEMCPY
(out_table_header,
-
acpi_gbl_root_table_list.tables[i].pointer,
-
sizeof(struct acpi_table_header));
+
memcpy
(out_table_header,
+ acpi_gbl_root_table_list.tables[i].pointer,
+ sizeof(struct acpi_table_header));
}
return (AE_OK);
}
}
return (AE_OK);
}