diff --git a/include/arch/arm/arch/machine/priv_timer.h b/include/arch/arm/arch/machine/priv_timer.h
index 83cbd0220a25d5ccd27f7b1478634d814dda798c..2db99980fd68a889ecbad0f52f067cb3a04075e6 100644
--- a/include/arch/arm/arch/machine/priv_timer.h
+++ b/include/arch/arm/arch/machine/priv_timer.h
@@ -26,7 +26,8 @@ struct timer {
 typedef volatile struct timer timer_t;
 extern timer_t *priv_timer;
 
-static inline void resetTimer(void) {
+static inline void resetTimer(void)
+{
     priv_timer->ints = TMR_INTS_EVENT;
 }
 
diff --git a/include/plat/allwinnerA20/plat/machine/timer.h b/include/plat/allwinnerA20/plat/machine/timer.h
index cd0c5e7237b182e26275ab081d8b757bcc8e731d..796f0e1836f70f15ff0c50f77fc3cda11803608a 100644
--- a/include/plat/allwinnerA20/plat/machine/timer.h
+++ b/include/plat/allwinnerA20/plat/machine/timer.h
@@ -29,7 +29,7 @@ extern timer_t *timer;
 
 static inline void resetTimer(void)
 {
-	timer->tmr_irq_sta_reg = TMR0_IRQ_PEND_FLAG;
+    timer->tmr_irq_sta_reg = TMR0_IRQ_PEND_FLAG;
 }
 
 #endif /* !__PLAT_MACHINE_TIMER_H */
diff --git a/include/plat/apq8064/plat/machine/timer.h b/include/plat/apq8064/plat/machine/timer.h
index a745ad73a18847aa3ed6975ba48343fe442da839..00f96a481f8f807f17b110d945c51d6175882d31 100644
--- a/include/plat/apq8064/plat/machine/timer.h
+++ b/include/plat/apq8064/plat/machine/timer.h
@@ -15,7 +15,8 @@
 
 #define TIMER_CLOCK_HZ 7000000llu
 
-static inline void resetTimer(void) {
+static inline void resetTimer(void)
+{
     /* Nothing to do */
 }
 
diff --git a/include/plat/exynos4/plat/machine/timer.h b/include/plat/exynos4/plat/machine/timer.h
index e53dc0a0b0862c7fb05284c9ea70d104923cdf4d..d9ff73e6c4dc193a61d9f7de43cf1fda5ef69245 100644
--- a/include/plat/exynos4/plat/machine/timer.h
+++ b/include/plat/exynos4/plat/machine/timer.h
@@ -17,7 +17,8 @@
 
 #define TIMER_CLOCK_HZ 24000000llu
 
-static inline void resetTimer(void) {
+static inline void resetTimer(void)
+{
     mct_reset();
 }
 
diff --git a/src/kernel/thread.c b/src/kernel/thread.c
index 9ea6c8f9a1055b32fc83aa3fb59616e85b6bb3ae..c46cccf340fd62a40ed4901d3cccfefb63e35364 100644
--- a/src/kernel/thread.c
+++ b/src/kernel/thread.c
@@ -298,7 +298,7 @@ schedule(void)
                 NODE_STATE(ksCurThread) == NODE_STATE(ksIdleThread)
                 || (candidate->tcbPriority < NODE_STATE(ksCurThread)->tcbPriority);
             if (fastfail &&
-                !isHighestPrio(ksCurDomain, candidate->tcbPriority)) {
+                    !isHighestPrio(ksCurDomain, candidate->tcbPriority)) {
                 SCHED_ENQUEUE(candidate);
                 /* we can't, need to reschedule */
                 NODE_STATE(ksSchedulerAction) = SchedulerAction_ChooseNewThread;
@@ -408,7 +408,7 @@ void
 possibleSwitchTo(tcb_t* target)
 {
     if (ksCurDomain != target->tcbDomain
-               SMP_COND_STATEMENT(|| target->tcbAffinity != getCurrentCPUIndex())) {
+            SMP_COND_STATEMENT( || target->tcbAffinity != getCurrentCPUIndex())) {
         SCHED_ENQUEUE(target);
     } else if (NODE_STATE(ksSchedulerAction) != SchedulerAction_ResumeCurrentThread) {
         /* Too many threads want special treatment, use regular queues. */
diff --git a/src/plat/exynos4/machine/hardware.c b/src/plat/exynos4/machine/hardware.c
index 866b755de41f90330bed85be6cb2778bfa1f44eb..f371807504cd36ab16c45dc66cbf6f4b06b42d17 100644
--- a/src/plat/exynos4/machine/hardware.c
+++ b/src/plat/exynos4/machine/hardware.c
@@ -19,7 +19,8 @@
 
 timer_t *mct = (timer_t *) EXYNOS_MCT_PPTR;
 
-BOOT_CODE void initTimer(void) {
+BOOT_CODE void initTimer(void)
+{
 
     mct_clear_write_status();
 
@@ -27,7 +28,7 @@ BOOT_CODE void initTimer(void) {
     mct->global.comp0_add_inc = TIMER_RELOAD;
 
     uint64_t  comparator_value = ((((uint64_t) mct->global.cnth) << 32llu)
-                                        | mct->global.cntl) + TIMER_RELOAD;
+                                  | mct->global.cntl) + TIMER_RELOAD;
     mct->global.comp0h = (uint32_t) (comparator_value >> 32u);
     mct->global.comp0l = (uint32_t) comparator_value;
     /* Enable interrupts */
diff --git a/src/plat/exynos5/machine/hardware.c b/src/plat/exynos5/machine/hardware.c
index 0b86c6f853cdc1425dd5c1c0333b616867f8c62c..8621225b5689eec0ae160303ee205cbfba480696 100644
--- a/src/plat/exynos5/machine/hardware.c
+++ b/src/plat/exynos5/machine/hardware.c
@@ -23,7 +23,8 @@
 
 timer_t *mct = (timer_t *) EXYNOS_MCT_PPTR;
 
-BOOT_CODE void initTimer(void) {
+BOOT_CODE void initTimer(void)
+{
     mct_clear_write_status();
 
     /* use the arm generic timer, backed by the mct */