From ae54db792661ff80ba0d2706200571a428f04c6b Mon Sep 17 00:00:00 2001 From: Felix Held Date: Fri, 26 Jan 2024 14:14:21 +0100 Subject: [PATCH] soc/amd: use expected function signature for soc_acpi_write_tables A pointer to soc_acpi_write_tables gets assigned to the write_acpi_tables element of the device_operations struct, so make sure that the function has the expected function signature which in this case means using unsigned long as type for both the 'current' parameter and the return value. Signed-off-by: Felix Held Change-Id: Iee45badb904fa20c6db146edbc00c40ca09361d1 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80218 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- src/soc/amd/cezanne/agesa_acpi.c | 4 ++-- src/soc/amd/cezanne/include/soc/acpi.h | 4 ++-- src/soc/amd/glinda/agesa_acpi.c | 4 ++-- src/soc/amd/glinda/include/soc/acpi.h | 4 ++-- src/soc/amd/mendocino/agesa_acpi.c | 4 ++-- src/soc/amd/mendocino/include/soc/acpi.h | 4 ++-- src/soc/amd/phoenix/agesa_acpi.c | 4 ++-- src/soc/amd/phoenix/include/soc/acpi.h | 4 ++-- src/soc/amd/picasso/agesa_acpi.c | 4 ++-- src/soc/amd/picasso/include/soc/acpi.h | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/soc/amd/cezanne/agesa_acpi.c b/src/soc/amd/cezanne/agesa_acpi.c index 5dfc59d5da..e22cc08877 100644 --- a/src/soc/amd/cezanne/agesa_acpi.c +++ b/src/soc/amd/cezanne/agesa_acpi.c @@ -7,8 +7,8 @@ #include #include -uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current, - acpi_rsdp_t *rsdp) +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp) { /* TODO: look into adding CRAT */ diff --git a/src/soc/amd/cezanne/include/soc/acpi.h b/src/soc/amd/cezanne/include/soc/acpi.h index 5c8b5d21e7..37655a904d 100644 --- a/src/soc/amd/cezanne/include/soc/acpi.h +++ b/src/soc/amd/cezanne/include/soc/acpi.h @@ -10,7 +10,7 @@ #define ACPI_SCI_IRQ 9 -uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current, - acpi_rsdp_t *rsdp); +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp); #endif /* AMD_CEZANNE_ACPI_H */ diff --git a/src/soc/amd/glinda/agesa_acpi.c b/src/soc/amd/glinda/agesa_acpi.c index e55431bb19..e04f7cb300 100644 --- a/src/soc/amd/glinda/agesa_acpi.c +++ b/src/soc/amd/glinda/agesa_acpi.c @@ -9,8 +9,8 @@ #include #include -uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current, - acpi_rsdp_t *rsdp) +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp) { /* TODO: look into adding CRAT */ diff --git a/src/soc/amd/glinda/include/soc/acpi.h b/src/soc/amd/glinda/include/soc/acpi.h index 6f8e06cdb5..d47ff002cc 100644 --- a/src/soc/amd/glinda/include/soc/acpi.h +++ b/src/soc/amd/glinda/include/soc/acpi.h @@ -12,7 +12,7 @@ #define ACPI_SCI_IRQ 9 -uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current, - acpi_rsdp_t *rsdp); +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp); #endif /* AMD_GLINDA_ACPI_H */ diff --git a/src/soc/amd/mendocino/agesa_acpi.c b/src/soc/amd/mendocino/agesa_acpi.c index 55267ecf5e..8866fc486f 100644 --- a/src/soc/amd/mendocino/agesa_acpi.c +++ b/src/soc/amd/mendocino/agesa_acpi.c @@ -9,8 +9,8 @@ #include #include -uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current, - acpi_rsdp_t *rsdp) +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp) { /* TODO: look into adding CRAT */ diff --git a/src/soc/amd/mendocino/include/soc/acpi.h b/src/soc/amd/mendocino/include/soc/acpi.h index e1994aa2ff..5b72492079 100644 --- a/src/soc/amd/mendocino/include/soc/acpi.h +++ b/src/soc/amd/mendocino/include/soc/acpi.h @@ -10,7 +10,7 @@ #define ACPI_SCI_IRQ 9 -uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current, - acpi_rsdp_t *rsdp); +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp); #endif /* AMD_MENDOCINO_ACPI_H */ diff --git a/src/soc/amd/phoenix/agesa_acpi.c b/src/soc/amd/phoenix/agesa_acpi.c index 98e25f64c5..e4fa2bfb26 100644 --- a/src/soc/amd/phoenix/agesa_acpi.c +++ b/src/soc/amd/phoenix/agesa_acpi.c @@ -10,8 +10,8 @@ #include #include -uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current, - acpi_rsdp_t *rsdp) +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp) { /* TODO: look into adding CRAT */ diff --git a/src/soc/amd/phoenix/include/soc/acpi.h b/src/soc/amd/phoenix/include/soc/acpi.h index 39687219f7..b3f7adce97 100644 --- a/src/soc/amd/phoenix/include/soc/acpi.h +++ b/src/soc/amd/phoenix/include/soc/acpi.h @@ -12,7 +12,7 @@ #define ACPI_SCI_IRQ 9 -uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current, - acpi_rsdp_t *rsdp); +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp); #endif /* AMD_PHOENIX_ACPI_H */ diff --git a/src/soc/amd/picasso/agesa_acpi.c b/src/soc/amd/picasso/agesa_acpi.c index 5604faad42..bde9543e29 100644 --- a/src/soc/amd/picasso/agesa_acpi.c +++ b/src/soc/amd/picasso/agesa_acpi.c @@ -539,8 +539,8 @@ static unsigned long acpi_fill_crat(struct acpi_crat_header *crat, unsigned long return current; } -uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current, - acpi_rsdp_t *rsdp) +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp) { struct acpi_crat_header *crat; diff --git a/src/soc/amd/picasso/include/soc/acpi.h b/src/soc/amd/picasso/include/soc/acpi.h index 7a0f749068..5f7e748f8d 100644 --- a/src/soc/amd/picasso/include/soc/acpi.h +++ b/src/soc/amd/picasso/include/soc/acpi.h @@ -10,7 +10,7 @@ #define ACPI_SCI_IRQ 9 -uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current, - acpi_rsdp_t *rsdp); +unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current, + acpi_rsdp_t *rsdp); #endif /* AMD_PICASSO_ACPI_H */