From 65cd299f52450cc93a6986c7a912a843a2c4f6da Mon Sep 17 00:00:00 2001 From: Soren Brinkmann Date: Thu, 14 Jan 2016 10:11:05 -0800 Subject: [PATCH] Remove direct usage of __attribute__((foo)) Migrate all direct usage of __attribute__ to usage of their corresponding macros from cdefs.h. e.g.: - __attribute__((unused)) -> __unused Signed-off-by: Soren Brinkmann --- docs/porting-guide.md | 2 +- drivers/io/io_fip.c | 2 +- drivers/io/io_memmap.c | 2 +- drivers/io/io_semihosting.c | 2 +- include/bl31/runtime_svc.h | 2 +- include/drivers/auth/img_parser_mod.h | 2 +- include/lib/bakery_lock.h | 3 +-- include/lib/cassert.h | 2 +- lib/aarch64/xlat_tables.c | 2 +- plat/arm/common/arm_io_storage.c | 6 +++--- plat/mediatek/mt8173/drivers/spm/spm.c | 6 +++--- services/std_svc/psci/psci_common.c | 2 +- 12 files changed, 16 insertions(+), 17 deletions(-) diff --git a/docs/porting-guide.md b/docs/porting-guide.md index cdb722af..687781a5 100644 --- a/docs/porting-guide.md +++ b/docs/porting-guide.md @@ -85,7 +85,7 @@ section identified by name `bakery_lock` inside `coherent_ram` so that its possible for the firmware to place variables in it using the following C code directive: - __attribute__ ((section("bakery_lock"))) + __section("bakery_lock") Or alternatively the following assembler code directive: diff --git a/drivers/io/io_fip.c b/drivers/io/io_fip.c index d2914238..99cf15b9 100644 --- a/drivers/io/io_fip.c +++ b/drivers/io/io_fip.c @@ -128,7 +128,7 @@ static const io_dev_info_t fip_dev_info = { /* Open a connection to the FIP device */ -static int fip_dev_open(const uintptr_t dev_spec __attribute__((unused)), +static int fip_dev_open(const uintptr_t dev_spec __unused, io_dev_info_t **dev_info) { assert(dev_info != NULL); diff --git a/drivers/io/io_memmap.c b/drivers/io/io_memmap.c index d45107e5..ff4efa89 100644 --- a/drivers/io/io_memmap.c +++ b/drivers/io/io_memmap.c @@ -95,7 +95,7 @@ static const io_dev_info_t memmap_dev_info = { /* Open a connection to the memmap device */ -static int memmap_dev_open(const uintptr_t dev_spec __attribute__((unused)), +static int memmap_dev_open(const uintptr_t dev_spec __unused, io_dev_info_t **dev_info) { assert(dev_info != NULL); diff --git a/drivers/io/io_semihosting.c b/drivers/io/io_semihosting.c index 63d0f68e..30ca99cb 100644 --- a/drivers/io/io_semihosting.c +++ b/drivers/io/io_semihosting.c @@ -91,7 +91,7 @@ static int sh_dev_open(const uintptr_t dev_spec __unused, /* Open a file on the semi-hosting device */ -static int sh_file_open(io_dev_info_t *dev_info __attribute__((unused)), +static int sh_file_open(io_dev_info_t *dev_info __unused, const uintptr_t spec, io_entity_t *entity) { int result = -ENOENT; diff --git a/include/bl31/runtime_svc.h b/include/bl31/runtime_svc.h index 87f2dd2c..03f906ef 100644 --- a/include/bl31/runtime_svc.h +++ b/include/bl31/runtime_svc.h @@ -88,7 +88,7 @@ typedef struct rt_svc_desc { */ #define DECLARE_RT_SVC(_name, _start, _end, _type, _setup, _smch) \ static const rt_svc_desc_t __svc_desc_ ## _name \ - __attribute__ ((section("rt_svc_descs"), used)) = { \ + __section("rt_svc_descs") __used = { \ .start_oen = _start, \ .end_oen = _end, \ .call_type = _type, \ diff --git a/include/drivers/auth/img_parser_mod.h b/include/drivers/auth/img_parser_mod.h index d80e0fb7..79d7d797 100644 --- a/include/drivers/auth/img_parser_mod.h +++ b/include/drivers/auth/img_parser_mod.h @@ -77,7 +77,7 @@ int img_parser_get_auth_param(img_type_t img_type, /* Macro to register an image parser library */ #define REGISTER_IMG_PARSER_LIB(_type, _name, _init, _check_int, _get_param) \ static const img_parser_lib_desc_t __img_parser_lib_desc_##_type \ - __attribute__ ((section(".img_parser_lib_descs"), used)) = { \ + __section(".img_parser_lib_descs") __used = { \ .img_type = _type, \ .name = _name, \ .init = _init, \ diff --git a/include/lib/bakery_lock.h b/include/lib/bakery_lock.h index 86adb9cb..8a538917 100644 --- a/include/lib/bakery_lock.h +++ b/include/lib/bakery_lock.h @@ -100,8 +100,7 @@ inline void bakery_lock_init(bakery_lock_t *bakery) {} void bakery_lock_get(bakery_lock_t *bakery); void bakery_lock_release(bakery_lock_t *bakery); -#define DEFINE_BAKERY_LOCK(_name) bakery_lock_t _name \ - __attribute__ ((section("bakery_lock"))) +#define DEFINE_BAKERY_LOCK(_name) bakery_lock_t _name __section("bakery_lock") #define DECLARE_BAKERY_LOCK(_name) extern bakery_lock_t _name diff --git a/include/lib/cassert.h b/include/lib/cassert.h index e8089cbb..00ee4d59 100644 --- a/include/lib/cassert.h +++ b/include/lib/cassert.h @@ -40,6 +40,6 @@ * compiler warning. ******************************************************************************/ #define CASSERT(cond, msg) \ - typedef char msg[(cond) ? 1 : -1] __attribute__((unused)) + typedef char msg[(cond) ? 1 : -1] __unused #endif /* __CASSERT_H__ */ diff --git a/lib/aarch64/xlat_tables.c b/lib/aarch64/xlat_tables.c index fa1a03da..b00dc0be 100644 --- a/lib/aarch64/xlat_tables.c +++ b/lib/aarch64/xlat_tables.c @@ -58,7 +58,7 @@ static uint64_t l1_xlation_table[NUM_L1_ENTRIES] __aligned(NUM_L1_ENTRIES * sizeof(uint64_t)); static uint64_t xlat_tables[MAX_XLAT_TABLES][XLAT_TABLE_ENTRIES] -__aligned(XLAT_TABLE_SIZE) __attribute__((section("xlat_table"))); +__aligned(XLAT_TABLE_SIZE) __section("xlat_table"); static unsigned next_xlat; static unsigned long max_pa; diff --git a/plat/arm/common/arm_io_storage.c b/plat/arm/common/arm_io_storage.c index 8c5845ce..153fdfe8 100644 --- a/plat/arm/common/arm_io_storage.c +++ b/plat/arm/common/arm_io_storage.c @@ -277,9 +277,9 @@ void plat_arm_io_setup(void) } int plat_arm_get_alt_image_source( - unsigned int image_id __attribute__((unused)), - uintptr_t *dev_handle __attribute__((unused)), - uintptr_t *image_spec __attribute__((unused))) + unsigned int image_id __unused, + uintptr_t *dev_handle __unused, + uintptr_t *image_spec __unused) { /* By default do not try an alternative */ return -ENOENT; diff --git a/plat/mediatek/mt8173/drivers/spm/spm.c b/plat/mediatek/mt8173/drivers/spm/spm.c index 7c6d72be..28019256 100644 --- a/plat/mediatek/mt8173/drivers/spm/spm.c +++ b/plat/mediatek/mt8173/drivers/spm/spm.c @@ -55,9 +55,9 @@ static int spm_dormant_sta = CPU_DORMANT_RESET; DEFINE_BAKERY_LOCK(spm_lock); -static int spm_hotplug_ready __attribute__ ((section("tzfw_coherent_mem"))); -static int spm_mcdi_ready __attribute__ ((section("tzfw_coherent_mem"))); -static int spm_suspend_ready __attribute__ ((section("tzfw_coherent_mem"))); +static int spm_hotplug_ready __section("tzfw_coherent_mem"); +static int spm_mcdi_ready __section("tzfw_coherent_mem"); +static int spm_suspend_ready __section("tzfw_coherent_mem"); void spm_lock_init(void) { diff --git a/services/std_svc/psci/psci_common.c b/services/std_svc/psci/psci_common.c index 73326952..465c5fd9 100644 --- a/services/std_svc/psci/psci_common.c +++ b/services/std_svc/psci/psci_common.c @@ -74,7 +74,7 @@ static plat_local_state_t ******************************************************************************/ non_cpu_pd_node_t psci_non_cpu_pd_nodes[PSCI_NUM_NON_CPU_PWR_DOMAINS] #if USE_COHERENT_MEM -__attribute__ ((section("tzfw_coherent_mem"))) +__section("tzfw_coherent_mem") #endif ; -- 2.30.2