mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-16 09:34:18 +00:00
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 <soren.brinkmann@xilinx.com>
This commit is contained in:
parent
70ecb564fd
commit
65cd299f52
12 changed files with 16 additions and 17 deletions
|
@ -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:
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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, \
|
||||
|
|
|
@ -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, \
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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__ */
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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
|
||||
;
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue