From ac136250b26ddcb54d61ed8428f110b607cb3c88 Mon Sep 17 00:00:00 2001 From: Bill XIE Date: Fri, 8 Jul 2022 16:53:21 +0800 Subject: commonlib: Substitude macro "__unused" in compiler.h Since there are many identifiers whose name contain "__unused" in headers of musl libc, introducing a macro which expands "__unused" to the source of a util may have disastrous effect during its compiling under a musl-based platform. However, it is hard to detect musl at build time as musl is notorious for having explicitly been refusing to add a macro like "__MUSL__" to announce its own presence. Using __always_unused and __maybe_unused for everything may be a good idea. This is how it works in the Linux kernel, so that would at least make us match some other standard rather than doing our own thing (especially since the other compiler.h shorthand macros are also inspired by Linux). Signed-off-by: Bill XIE Change-Id: I547ae3371d7568f5aed732ceefe0130a339716a9 Reviewed-on: https://review.coreboot.org/c/coreboot/+/65717 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer Reviewed-by: Julius Werner --- src/drivers/crb/tis.c | 2 +- src/drivers/spi/spi_sdcard.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/drivers') diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c index 95b0656d96..c3cc3e790d 100644 --- a/src/drivers/crb/tis.c +++ b/src/drivers/crb/tis.c @@ -127,7 +127,7 @@ static const char *crb_tpm_acpi_name(const struct device *dev) return "TPM"; } -static struct device_operations __unused crb_ops = { +static struct device_operations __maybe_unused crb_ops = { .read_resources = noop_read_resources, .set_resources = noop_set_resources, #if CONFIG(HAVE_ACPI_TABLES) diff --git a/src/drivers/spi/spi_sdcard.c b/src/drivers/spi/spi_sdcard.c index 0a18953395..e930b50b13 100644 --- a/src/drivers/spi/spi_sdcard.c +++ b/src/drivers/spi/spi_sdcard.c @@ -210,7 +210,7 @@ static int lookup_response_length(int response_type) static int response_resolve(int response_type, uint8_t *response, uint32_t *out_register) { - __unused static const char * const sd_err[] = { + __maybe_unused static const char * const sd_err[] = { "Card is locked", "wp erase skip | lock/unlok cmd failed", "error", -- cgit v1.2.3