Merge pull request #152 from jcastillo-arm/jc/tf-issues/073-v2

Remove all checkpatch errors from codebase
This commit is contained in:
danh-arm 2014-06-24 16:48:31 +01:00
commit e73af8ac68
18 changed files with 34 additions and 33 deletions

View File

@ -234,9 +234,9 @@ realclean distclean:
checkcodebase: locate-checkpatch checkcodebase: locate-checkpatch
@echo " CHECKING STYLE" @echo " CHECKING STYLE"
@if test -d .git ; then \ @if test -d .git ; then \
git ls-files | while read GIT_FILE ; do ${CHECKPATCH} ${CHECKCODE_ARGS} -f $$GIT_FILE ; done ; \ git ls-files | grep -v stdlib | while read GIT_FILE ; do ${CHECKPATCH} ${CHECKCODE_ARGS} -f $$GIT_FILE ; done ; \
else \ else \
find . -type f -not -iwholename "*.git*" -not -iwholename "*build*" -exec ${CHECKPATCH} ${CHECKCODE_ARGS} -f {} \; ; \ find . -type f -not -iwholename "*.git*" -not -iwholename "*build*" -not -iwholename "*stdlib*" -exec ${CHECKPATCH} ${CHECKCODE_ARGS} -f {} \; ; \
fi fi
checkpatch: locate-checkpatch checkpatch: locate-checkpatch

View File

@ -62,7 +62,8 @@ void bl1_arch_setup(void)
/******************************************************************************* /*******************************************************************************
* Set the Secure EL1 required architectural state * Set the Secure EL1 required architectural state
******************************************************************************/ ******************************************************************************/
void bl1_arch_next_el_setup(void) { void bl1_arch_next_el_setup(void)
{
unsigned long next_sctlr; unsigned long next_sctlr;
/* Use the same endianness than the current BL */ /* Use the same endianness than the current BL */

View File

@ -56,7 +56,7 @@ static uint32_t next_image_type;
/******************************************************************************* /*******************************************************************************
* Simple function to initialise all BL31 helper libraries. * Simple function to initialise all BL31 helper libraries.
******************************************************************************/ ******************************************************************************/
void bl31_lib_init() void bl31_lib_init(void)
{ {
cm_init(); cm_init();
} }
@ -137,7 +137,7 @@ uint32_t bl31_get_next_image_type(void)
* This function programs EL3 registers and performs other setup to enable entry * This function programs EL3 registers and performs other setup to enable entry
* into the next image after BL31 at the next ERET. * into the next image after BL31 at the next ERET.
******************************************************************************/ ******************************************************************************/
void bl31_prepare_next_image_entry() void bl31_prepare_next_image_entry(void)
{ {
entry_point_info_t *next_image_info; entry_point_info_t *next_image_info;
uint32_t image_type; uint32_t image_type;

View File

@ -56,7 +56,7 @@
* which will used for programming an entry into a lower EL. The same context * which will used for programming an entry into a lower EL. The same context
* will used to save state upon exception entry from that EL. * will used to save state upon exception entry from that EL.
******************************************************************************/ ******************************************************************************/
void cm_init() void cm_init(void)
{ {
/* /*
* The context management library has only global data to intialize, but * The context management library has only global data to intialize, but

View File

@ -78,7 +78,7 @@ static int32_t validate_rt_svc_desc(rt_svc_desc_t *desc)
* The unique oen is used as an index into the 'rt_svc_descs_indices' array. * The unique oen is used as an index into the 'rt_svc_descs_indices' array.
* The index of the runtime service descriptor is stored at this index. * The index of the runtime service descriptor is stored at this index.
******************************************************************************/ ******************************************************************************/
void runtime_svc_init() void runtime_svc_init(void)
{ {
int32_t rc = 0; int32_t rc = 0;
uint32_t index, start_idx, end_idx; uint32_t index, start_idx, end_idx;

View File

@ -72,7 +72,7 @@ void tsp_update_sync_fiq_stats(uint32_t type, uint64_t elr_el3)
* architecture version in v2.0 and the secure physical timer interrupt is the * architecture version in v2.0 and the secure physical timer interrupt is the
* only S-EL1 interrupt that it needs to handle. * only S-EL1 interrupt that it needs to handle.
******************************************************************************/ ******************************************************************************/
int32_t tsp_fiq_handler() int32_t tsp_fiq_handler(void)
{ {
uint64_t mpidr = read_mpidr(); uint64_t mpidr = read_mpidr();
uint32_t linear_id = platform_get_core_pos(mpidr), id; uint32_t linear_id = platform_get_core_pos(mpidr), id;
@ -109,7 +109,7 @@ int32_t tsp_fiq_handler()
return 0; return 0;
} }
int32_t tsp_irq_received() int32_t tsp_irq_received(void)
{ {
uint64_t mpidr = read_mpidr(); uint64_t mpidr = read_mpidr();
uint32_t linear_id = platform_get_core_pos(mpidr); uint32_t linear_id = platform_get_core_pos(mpidr);

View File

@ -46,7 +46,7 @@ static timer_context_t pcpu_timer_context[PLATFORM_CORE_COUNT];
/******************************************************************************* /*******************************************************************************
* This function initializes the generic timer to fire every 0.5 second * This function initializes the generic timer to fire every 0.5 second
******************************************************************************/ ******************************************************************************/
void tsp_generic_timer_start() void tsp_generic_timer_start(void)
{ {
uint64_t cval; uint64_t cval;
uint32_t ctl = 0; uint32_t ctl = 0;
@ -63,7 +63,7 @@ void tsp_generic_timer_start()
/******************************************************************************* /*******************************************************************************
* This function deasserts the timer interrupt and sets it up again * This function deasserts the timer interrupt and sets it up again
******************************************************************************/ ******************************************************************************/
void tsp_generic_timer_handler() void tsp_generic_timer_handler(void)
{ {
/* Ensure that the timer did assert the interrupt */ /* Ensure that the timer did assert the interrupt */
assert(get_cntp_ctl_istatus(read_cntps_ctl_el1())); assert(get_cntp_ctl_istatus(read_cntps_ctl_el1()));
@ -76,7 +76,7 @@ void tsp_generic_timer_handler()
/******************************************************************************* /*******************************************************************************
* This function deasserts the timer interrupt prior to cpu power down * This function deasserts the timer interrupt prior to cpu power down
******************************************************************************/ ******************************************************************************/
void tsp_generic_timer_stop() void tsp_generic_timer_stop(void)
{ {
/* Disable the timer */ /* Disable the timer */
write_cntps_ctl_el1(0); write_cntps_ctl_el1(0);
@ -85,7 +85,7 @@ void tsp_generic_timer_stop()
/******************************************************************************* /*******************************************************************************
* This function saves the timer context prior to cpu suspension * This function saves the timer context prior to cpu suspension
******************************************************************************/ ******************************************************************************/
void tsp_generic_timer_save() void tsp_generic_timer_save(void)
{ {
uint32_t linear_id = platform_get_core_pos(read_mpidr()); uint32_t linear_id = platform_get_core_pos(read_mpidr());
@ -98,7 +98,7 @@ void tsp_generic_timer_save()
/******************************************************************************* /*******************************************************************************
* This function restores the timer context post cpu resummption * This function restores the timer context post cpu resummption
******************************************************************************/ ******************************************************************************/
void tsp_generic_timer_restore() void tsp_generic_timer_restore(void)
{ {
uint32_t linear_id = platform_get_core_pos(read_mpidr()); uint32_t linear_id = platform_get_core_pos(read_mpidr());

View File

@ -40,7 +40,7 @@ void bl31_arch_setup(void);
void bl31_next_el_arch_setup(uint32_t security_state); void bl31_next_el_arch_setup(uint32_t security_state);
void bl31_set_next_image_type(uint32_t type); void bl31_set_next_image_type(uint32_t type);
uint32_t bl31_get_next_image_type(void); uint32_t bl31_get_next_image_type(void);
void bl31_prepare_next_image_entry(); void bl31_prepare_next_image_entry(void);
void bl31_register_bl32_init(int32_t (*)(void)); void bl31_register_bl32_init(int32_t (*)(void));
#endif /* __BL31_H__ */ #endif /* __BL31_H__ */

View File

@ -264,7 +264,7 @@ CASSERT(RT_SVC_DESC_HANDLE == __builtin_offsetof(rt_svc_desc_t, handle), \
/******************************************************************************* /*******************************************************************************
* Function & variable prototypes * Function & variable prototypes
******************************************************************************/ ******************************************************************************/
void runtime_svc_init(); void runtime_svc_init(void);
extern uint64_t __RT_SVC_DESCS_START__; extern uint64_t __RT_SVC_DESCS_START__;
extern uint64_t __RT_SVC_DESCS_END__; extern uint64_t __RT_SVC_DESCS_END__;
void init_crash_reporting(void); void init_crash_reporting(void);

View File

@ -85,14 +85,14 @@ static inline void write_ ## _name(const uint64_t v) \
/* Define function for simple system instruction */ /* Define function for simple system instruction */
#define DEFINE_SYSOP_FUNC(_op) \ #define DEFINE_SYSOP_FUNC(_op) \
static inline void _op() \ static inline void _op(void) \
{ \ { \
__asm__ (#_op); \ __asm__ (#_op); \
} }
/* Define function for system instruction with type specifier */ /* Define function for system instruction with type specifier */
#define DEFINE_SYSOP_TYPE_FUNC(_op, _type) \ #define DEFINE_SYSOP_TYPE_FUNC(_op, _type) \
static inline void _op ## _type() \ static inline void _op ## _type(void) \
{ \ { \
__asm__ (#_op " " #_type); \ __asm__ (#_op " " #_type); \
} }

View File

@ -165,7 +165,7 @@ unsigned int plat_get_aff_state(unsigned int, unsigned long);
/******************************************************************************* /*******************************************************************************
* Optional BL3-1 functions (may be overridden) * Optional BL3-1 functions (may be overridden)
******************************************************************************/ ******************************************************************************/
void bl31_plat_enable_mmu(); void bl31_plat_enable_mmu(void);
/******************************************************************************* /*******************************************************************************
* Mandatory BL3-2 functions (only if platform contains a BL3-2) * Mandatory BL3-2 functions (only if platform contains a BL3-2)
@ -175,6 +175,6 @@ void bl32_platform_setup(void);
/******************************************************************************* /*******************************************************************************
* Optional BL3-2 functions (may be overridden) * Optional BL3-2 functions (may be overridden)
******************************************************************************/ ******************************************************************************/
void bl32_plat_enable_mmu(); void bl32_plat_enable_mmu(void);
#endif /* __PLATFORM_H__ */ #endif /* __PLATFORM_H__ */

View File

@ -38,12 +38,12 @@
#pragma weak bl31_plat_enable_mmu #pragma weak bl31_plat_enable_mmu
#pragma weak bl32_plat_enable_mmu #pragma weak bl32_plat_enable_mmu
void bl31_plat_enable_mmu() void bl31_plat_enable_mmu(void)
{ {
enable_mmu_el3(); enable_mmu_el3();
} }
void bl32_plat_enable_mmu() void bl32_plat_enable_mmu(void)
{ {
enable_mmu_el1(); enable_mmu_el1();
} }

View File

@ -212,7 +212,7 @@ void bl2_plat_flush_bl31_params(void)
* Perform the very early platform specific architectural setup here. At the * Perform the very early platform specific architectural setup here. At the
* moment this is only intializes the mmu in a quick and dirty way. * moment this is only intializes the mmu in a quick and dirty way.
******************************************************************************/ ******************************************************************************/
void bl2_plat_arch_setup() void bl2_plat_arch_setup(void)
{ {
fvp_configure_mmu_el1(bl2_tzram_layout.total_base, fvp_configure_mmu_el1(bl2_tzram_layout.total_base,
bl2_tzram_layout.total_size, bl2_tzram_layout.total_size,

View File

@ -167,7 +167,7 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
* Initialize the gic, configure the CLCD and zero out variables needed by the * Initialize the gic, configure the CLCD and zero out variables needed by the
* secondaries to boot up correctly. * secondaries to boot up correctly.
******************************************************************************/ ******************************************************************************/
void bl31_platform_setup() void bl31_platform_setup(void)
{ {
unsigned int reg_val; unsigned int reg_val;
@ -207,7 +207,7 @@ void bl31_platform_setup()
* Perform the very early platform specific architectural setup here. At the * Perform the very early platform specific architectural setup here. At the
* moment this is only intializes the mmu in a quick and dirty way. * moment this is only intializes the mmu in a quick and dirty way.
******************************************************************************/ ******************************************************************************/
void bl31_plat_arch_setup() void bl31_plat_arch_setup(void)
{ {
#if RESET_TO_BL31 #if RESET_TO_BL31
fvp_cci_setup(); fvp_cci_setup();

View File

@ -81,7 +81,7 @@ void bl32_early_platform_setup(void)
/******************************************************************************* /*******************************************************************************
* Perform platform specific setup placeholder * Perform platform specific setup placeholder
******************************************************************************/ ******************************************************************************/
void bl32_platform_setup() void bl32_platform_setup(void)
{ {
} }
@ -90,7 +90,7 @@ void bl32_platform_setup()
* Perform the very early platform specific architectural setup here. At the * Perform the very early platform specific architectural setup here. At the
* moment this is only intializes the MMU * moment this is only intializes the MMU
******************************************************************************/ ******************************************************************************/
void bl32_plat_arch_setup() void bl32_plat_arch_setup(void)
{ {
fvp_configure_mmu_el1(BL32_RO_BASE, fvp_configure_mmu_el1(BL32_RO_BASE,
(BL32_COHERENT_RAM_LIMIT - BL32_RO_BASE), (BL32_COHERENT_RAM_LIMIT - BL32_RO_BASE),

View File

@ -324,7 +324,7 @@ uint32_t plat_interrupt_type_to_line(uint32_t type, uint32_t security_state)
* the GIC cpu interface. INTR_TYPE_INVAL is returned when there is no * the GIC cpu interface. INTR_TYPE_INVAL is returned when there is no
* interrupt pending. * interrupt pending.
******************************************************************************/ ******************************************************************************/
uint32_t plat_ic_get_pending_interrupt_type() uint32_t plat_ic_get_pending_interrupt_type(void)
{ {
uint32_t id, gicc_base; uint32_t id, gicc_base;
@ -346,7 +346,7 @@ uint32_t plat_ic_get_pending_interrupt_type()
* the GIC cpu interface. INTR_ID_UNAVAILABLE is returned when there is no * the GIC cpu interface. INTR_ID_UNAVAILABLE is returned when there is no
* interrupt pending. * interrupt pending.
******************************************************************************/ ******************************************************************************/
uint32_t plat_ic_get_pending_interrupt_id() uint32_t plat_ic_get_pending_interrupt_id(void)
{ {
uint32_t id, gicc_base; uint32_t id, gicc_base;
@ -370,7 +370,7 @@ uint32_t plat_ic_get_pending_interrupt_id()
* This functions reads the GIC cpu interface Interrupt Acknowledge register * This functions reads the GIC cpu interface Interrupt Acknowledge register
* to start handling the pending interrupt. It returns the contents of the IAR. * to start handling the pending interrupt. It returns the contents of the IAR.
******************************************************************************/ ******************************************************************************/
uint32_t plat_ic_acknowledge_interrupt() uint32_t plat_ic_acknowledge_interrupt(void)
{ {
return gicc_read_IAR(fvp_get_cfgvar(CONFIG_GICC_ADDR)); return gicc_read_IAR(fvp_get_cfgvar(CONFIG_GICC_ADDR));
} }

View File

@ -180,7 +180,7 @@ unsigned int plat_get_aff_state(unsigned int aff_lvl,
* Handy optimization to prevent the psci implementation from traversing through * Handy optimization to prevent the psci implementation from traversing through
* affinity levels which are not present while detecting the platform topology. * affinity levels which are not present while detecting the platform topology.
******************************************************************************/ ******************************************************************************/
int plat_get_max_afflvl() int plat_get_max_afflvl(void)
{ {
return MPIDR_AFFLVL1; return MPIDR_AFFLVL1;
} }
@ -190,7 +190,7 @@ int plat_get_max_afflvl()
* the FVP flavour its running on. We construct all the mpidrs we can handle * the FVP flavour its running on. We construct all the mpidrs we can handle
* and rely on the PWRC.PSYSR to flag absent cpus when their status is queried. * and rely on the PWRC.PSYSR to flag absent cpus when their status is queried.
******************************************************************************/ ******************************************************************************/
int fvp_setup_topology() int fvp_setup_topology(void)
{ {
unsigned char aff0, aff1, aff_state, aff0_offset = 0; unsigned char aff0, aff1, aff_state, aff0_offset = 0;
unsigned long mpidr; unsigned long mpidr;

View File

@ -98,7 +98,7 @@ int get_power_on_target_afflvl(unsigned long mpidr)
* Simple routine to retrieve the maximum affinity level supported by the * Simple routine to retrieve the maximum affinity level supported by the
* platform and check that it makes sense. * platform and check that it makes sense.
******************************************************************************/ ******************************************************************************/
int get_max_afflvl() int get_max_afflvl(void)
{ {
int aff_lvl; int aff_lvl;