ARM: replace ACPI_MEMCPY with memcpy

ACPI_MEMCPY is defined as memcpy. The macro is for the benefit of
drivers/acpi and shouldn't be used elsewhere.

Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Acked-by: Julien Grall <julien.grall@arm.com>
This commit is contained in:
Stefano Stabellini committed 2017-10-10 13:25:46 -07:00
1 parent 888ce824f2
commit 3b40cfcd1a
3 files changed
+9 -9

No files matched your search

+7 -7
View File
@@ -1582,7 +1582,7 @@ static int acpi_create_rsdp(struct domain *d, struct membank tbl_add[])
rsdp = acpi_os_map_memory(addr, table_size);
base_ptr = d->arch.efi_acpi_table
+ acpi_get_table_offset(tbl_add, TBL_RSDP);
ACPI_MEMCPY(base_ptr, rsdp, table_size);
memcpy(base_ptr, rsdp, table_size);
acpi_os_unmap_memory(rsdp, table_size);
rsdp = (struct acpi_table_rsdp *)base_ptr;
@@ -1644,7 +1644,7 @@ static int acpi_create_xsdt(struct domain *d, struct membank tbl_add[])
/ sizeof(u64);
base_ptr = d->arch.efi_acpi_table
+ acpi_get_table_offset(tbl_add, TBL_XSDT);
ACPI_MEMCPY(base_ptr, table, table->length);
memcpy(base_ptr, table, table->length);
acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
acpi_os_unmap_memory(rsdp_tbl, sizeof(struct acpi_table_rsdp));
@@ -1687,10 +1687,10 @@ static int acpi_create_stao(struct domain *d, struct membank tbl_add[])
}
base_ptr = d->arch.efi_acpi_table + offset;
ACPI_MEMCPY(base_ptr, table, sizeof(struct acpi_table_header));
memcpy(base_ptr, table, sizeof(struct acpi_table_header));
stao = (struct acpi_table_stao *)base_ptr;
ACPI_MEMCPY(stao->header.signature, ACPI_SIG_STAO, 4);
memcpy(stao->header.signature, ACPI_SIG_STAO, 4);
stao->header.revision = 1;
stao->header.length = table_size;
stao->ignore_uart = 1;
@@ -1726,7 +1726,7 @@ static int acpi_create_madt(struct domain *d, struct membank tbl_add[])
}
base_ptr = d->arch.efi_acpi_table + offset;
ACPI_MEMCPY(base_ptr, table, table_size);
memcpy(base_ptr, table, table_size);
/* Add Generic Distributor. */
header = acpi_table_get_entry_madt(ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR, 0);
@@ -1736,7 +1736,7 @@ static int acpi_create_madt(struct domain *d, struct membank tbl_add[])
return -EINVAL;
}
gicd = container_of(header, struct acpi_madt_generic_distributor, header);
ACPI_MEMCPY(base_ptr + table_size, gicd,
memcpy(base_ptr + table_size, gicd,
sizeof(struct acpi_madt_generic_distributor));
table_size += sizeof(struct acpi_madt_generic_distributor);
@@ -1782,7 +1782,7 @@ static int acpi_create_fadt(struct domain *d, struct membank tbl_add[])
table_size = table->length;
base_ptr = d->arch.efi_acpi_table
+ acpi_get_table_offset(tbl_add, TBL_FADT);
ACPI_MEMCPY(base_ptr, table, table_size);
memcpy(base_ptr, table, table_size);
fadt = (struct acpi_table_fadt *)base_ptr;
/* Set PSCI_COMPLIANT and PSCI_USE_HVC */
+1 -1
View File
@@ -1039,7 +1039,7 @@ static int gicv2_make_hwdom_madt(const struct domain *d, u32 offset)
for ( i = 0; i < d->max_vcpus; i++ )
{
gicc = (struct acpi_madt_generic_interrupt *)(base_ptr + table_len);
ACPI_MEMCPY(gicc, host_gicc, size);
memcpy(gicc, host_gicc, size);
gicc->cpu_interface_number = i;
gicc->uid = i;
gicc->flags = ACPI_MADT_ENABLED;
+1 -1
View File
@@ -1378,7 +1378,7 @@ static int gicv3_make_hwdom_madt(const struct domain *d, u32 offset)
for ( i = 0; i < d->max_vcpus; i++ )
{
gicc = (struct acpi_madt_generic_interrupt *)(base_ptr + table_len);
ACPI_MEMCPY(gicc, host_gicc, size);
memcpy(gicc, host_gicc, size);
gicc->cpu_interface_number = i;
gicc->uid = i;
gicc->flags = ACPI_MADT_ENABLED;
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.