diff --git a/os/hal/osal/nil/osal.h b/os/hal/osal/nil/osal.h
index d4538bc7b..bde9aa44f 100644
--- a/os/hal/osal/nil/osal.h
+++ b/os/hal/osal/nil/osal.h
@@ -548,7 +548,7 @@ static inline void osalSysUnlockFromISR(void) {
  *
  * @xclass
  */
-static inline syssts_t osalSysGetStatusAndLockX(void)  {
+static inline syssts_t osalSysGetStatusAndLockX(void) {
 
   return chSysGetStatusAndLockX();
 }
diff --git a/os/hal/osal/os-less/ARMCMx/osal.h b/os/hal/osal/os-less/ARMCMx/osal.h
index 3887f8f04..032bd6a4c 100644
--- a/os/hal/osal/os-less/ARMCMx/osal.h
+++ b/os/hal/osal/os-less/ARMCMx/osal.h
@@ -664,7 +664,7 @@ static inline void osalSysUnlockFromISR(void) {
  *
  * @xclass
  */
-static inline syssts_t osalSysGetStatusAndLockX(void)  {
+static inline syssts_t osalSysGetStatusAndLockX(void) {
   syssts_t sts;
 
 #if CORTEX_MODEL == 0
diff --git a/os/hal/osal/rt/osal.h b/os/hal/osal/rt/osal.h
index 96b493905..5003bfe53 100644
--- a/os/hal/osal/rt/osal.h
+++ b/os/hal/osal/rt/osal.h
@@ -539,7 +539,7 @@ static inline void osalSysUnlockFromISR(void) {
  *
  * @xclass
  */
-static inline syssts_t osalSysGetStatusAndLockX(void)  {
+static inline syssts_t osalSysGetStatusAndLockX(void) {
 
   return chSysGetStatusAndLockX();
 }
diff --git a/os/hal/ports/AVR/pal_lld.h b/os/hal/ports/AVR/pal_lld.h
index b69539ae9..209744c72 100644
--- a/os/hal/ports/AVR/pal_lld.h
+++ b/os/hal/ports/AVR/pal_lld.h
@@ -54,7 +54,7 @@
 /**
  * @brief   AVR setup registers.
  */
-typedef struct  {
+typedef struct {
   uint8_t  out;
   uint8_t  dir;
 } avr_gpio_setup_t;
@@ -65,7 +65,7 @@ typedef struct  {
  *          ports, the ports with abnormal layout cannot be used through
  *          PAL driver. Example: PORT F on Mega128.
  */
-typedef struct  {
+typedef struct {
   volatile uint8_t  in;
   volatile uint8_t  dir;
   volatile uint8_t  out;
diff --git a/os/hal/templates/osal/osal.h b/os/hal/templates/osal/osal.h
index f0ead5c0b..1ad861842 100644
--- a/os/hal/templates/osal/osal.h
+++ b/os/hal/templates/osal/osal.h
@@ -561,7 +561,7 @@ static inline void osalSysUnlockFromISR(void) {
  *
  * @xclass
  */
-static inline syssts_t osalSysGetStatusAndLockX(void)  {
+static inline syssts_t osalSysGetStatusAndLockX(void) {
 
   return (syssts_t)0;
 }