Fix coding guideline warnings

This patch fixes some coding guideline warnings reported by the checkpatch
script. Only files related to upcoming feature development have been fixed.

Change-Id: I26fbce75c02ed62f00493ed6c106fe7c863ddbc5

diff --git a/include/bl31/cpu_data.h b/include/bl31/cpu_data.h
index 3a1db5c725caaa4d9895c20746fb9fc910b28f86..4fc801bf481c4ee2844e8c33a328c5a5fb815402 100644 (file)
--- a/include/bl31/cpu_data.h
+++ b/include/bl31/cpu_data.h
@@ -123,10 +123,10 @@ void init_cpu_ops(void);
 #define get_cpu_data_by_index(_ix, _m)    _cpu_data_by_index(_ix)->_m
 #define set_cpu_data_by_index(_ix, _m, _v) _cpu_data_by_index(_ix)->_m = _v
 
-#define flush_cpu_data(_m)        flush_dcache_range((uintptr_t)         \
+#define flush_cpu_data(_m)        flush_dcache_range((uintptr_t)         \
                                                      &(_cpu_data()->_m), \
                                                      sizeof(_cpu_data()->_m))
-#define inv_cpu_data(_m)          inv_dcache_range((uintptr_t)           \
+#define inv_cpu_data(_m)          inv_dcache_range((uintptr_t)           \
                                                      &(_cpu_data()->_m), \
                                                      sizeof(_cpu_data()->_m))
 #define flush_cpu_data_by_index(_ix, _m)       \

diff --git a/include/common/context.h b/include/common/context.h
index ec47f2ad8d7a4687c4eb6dcd85076c621c8e3ae3..b528c03b7f6fc7e0598c244e8042b6ce93660301 100644 (file)
--- a/include/common/context.h
+++ b/include/common/context.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -298,35 +298,35 @@ CASSERT(CTX_EL3STATE_OFFSET == __builtin_offsetof(cpu_context_t, el3state_ctx),
  */
 #define set_aapcs_args0(ctx, x0)                               do {    \
                write_ctx_reg(get_gpregs_ctx(ctx), CTX_GPREG_X0, x0);   \
-       } while (0);
+       } while (0)
 #define set_aapcs_args1(ctx, x0, x1)                           do {    \
                write_ctx_reg(get_gpregs_ctx(ctx), CTX_GPREG_X1, x1);   \
                set_aapcs_args0(ctx, x0);                               \
-       } while (0);
+       } while (0)
 #define set_aapcs_args2(ctx, x0, x1, x2)                       do {    \
                write_ctx_reg(get_gpregs_ctx(ctx), CTX_GPREG_X2, x2);   \
                set_aapcs_args1(ctx, x0, x1);                           \
-       } while (0);
+       } while (0)
 #define set_aapcs_args3(ctx, x0, x1, x2, x3)                   do {    \
                write_ctx_reg(get_gpregs_ctx(ctx), CTX_GPREG_X3, x3);   \
                set_aapcs_args2(ctx, x0, x1, x2);                       \
-       } while (0);
+       } while (0)
 #define set_aapcs_args4(ctx, x0, x1, x2, x3, x4)               do {    \
                write_ctx_reg(get_gpregs_ctx(ctx), CTX_GPREG_X4, x4);   \
                set_aapcs_args3(ctx, x0, x1, x2, x3);                   \
-       } while (0);
+       } while (0)
 #define set_aapcs_args5(ctx, x0, x1, x2, x3, x4, x5)           do {    \
                write_ctx_reg(get_gpregs_ctx(ctx), CTX_GPREG_X5, x5);   \
                set_aapcs_args4(ctx, x0, x1, x2, x3, x4);               \
-       } while (0);
+       } while (0)
 #define set_aapcs_args6(ctx, x0, x1, x2, x3, x4, x5, x6)       do {    \
                write_ctx_reg(get_gpregs_ctx(ctx), CTX_GPREG_X6, x6);   \
                set_aapcs_args5(ctx, x0, x1, x2, x3, x4, x5);           \
-       } while (0);
+       } while (0)
 #define set_aapcs_args7(ctx, x0, x1, x2, x3, x4, x5, x6, x7)   do {    \
                write_ctx_reg(get_gpregs_ctx(ctx), CTX_GPREG_X7, x7);   \
                set_aapcs_args6(ctx, x0, x1, x2, x3, x4, x5, x6);       \
-       } while (0);
+       } while (0)
 
 /*******************************************************************************
  * Function prototypes

diff --git a/include/common/smcc_helpers.h b/include/common/smcc_helpers.h
index 6a07b013251b7f77178446279992df67ec729ce1..6279cf23873a0cce01464de0b15cdf770e6fee2d 100644 (file)
--- a/include/common/smcc_helpers.h
+++ b/include/common/smcc_helpers.h
@@ -119,18 +119,18 @@
  * to SMC handler. These takes the offset values defined in context.h
  */
 #define SMC_GET_GP(_h, _g) \
-       read_ctx_reg(get_gpregs_ctx(_h), (_g));
+       read_ctx_reg(get_gpregs_ctx(_h), (_g))
 #define SMC_SET_GP(_h, _g, _v) \
-       write_ctx_reg(get_gpregs_ctx(_h), (_g), (_v));
+       write_ctx_reg(get_gpregs_ctx(_h), (_g), (_v))
 
 /*
  * Convenience macros to access EL3 context registers using handle provided to
  * SMC handler. These takes the offset values defined in context.h
  */
 #define SMC_GET_EL3(_h, _e) \
-       read_ctx_reg(get_el3state_ctx(_h), (_e));
+       read_ctx_reg(get_el3state_ctx(_h), (_e))
 #define SMC_SET_EL3(_h, _e, _v) \
-       write_ctx_reg(get_el3state_ctx(_h), (_e), (_v));
+       write_ctx_reg(get_el3state_ctx(_h), (_e), (_v))
 
 /* The macro below is used to identify a Standard Service SMC call */
 #define is_std_svc_call(_fid)          ((((_fid) >> FUNCID_OEN_SHIFT) & \

diff --git a/services/std_svc/psci/psci_common.c b/services/std_svc/psci/psci_common.c
index a651d99f8cc53386b6f4050b10af2f5e9a378834..2a0afb4c350914ea3cba24c1b91b705e4386836d 100644 (file)
--- a/services/std_svc/psci/psci_common.c
+++ b/services/std_svc/psci/psci_common.c
@@ -817,7 +817,7 @@ void psci_print_power_domain_map(void)
        plat_local_state_type_t state_type;
 
        /* This array maps to the PSCI_STATE_X definitions in psci.h */
-       static const char *psci_state_type_str[] = {
+       static const char * const psci_state_type_str[] = {
                "ON",
                "RETENTION",
                "OFF",

diff --git a/services/std_svc/psci/psci_main.c b/services/std_svc/psci/psci_main.c
index 86df9a11fc22c9abf71ac9ca32576ea01b102b41..04ef10e7785d55346bab899983aabb1a602fb524 100644 (file)
--- a/services/std_svc/psci/psci_main.c
+++ b/services/std_svc/psci/psci_main.c
@@ -94,7 +94,7 @@ int psci_cpu_suspend(unsigned int power_state,
        is_power_down_state = psci_get_pstate_type(power_state);
 
        /* Sanity check the requested suspend levels */
-       assert (psci_validate_suspend_req(&state_info, is_power_down_state)
+       assert(psci_validate_suspend_req(&state_info, is_power_down_state)
                        == PSCI_E_SUCCESS);
 
        target_pwrlvl = psci_find_target_suspend_lvl(&state_info);
@@ -217,7 +217,7 @@ int psci_cpu_off(void)
         * The only error cpu_off can return is E_DENIED. So check if that's
         * indeed the case.
         */
-       assert (rc == PSCI_E_DENIED);
+       assert(rc == PSCI_E_DENIED);
 
        return rc;
 }