diff --git a/src/drivers/boards/esc35-v1/bootloader/boot.c b/src/drivers/boards/esc35-v1/bootloader/boot.c
index 81f29934ba..911e231466 100644
--- a/src/drivers/boards/esc35-v1/bootloader/boot.c
+++ b/src/drivers/boards/esc35-v1/bootloader/boot.c
@@ -167,7 +167,7 @@ uint8_t board_get_product_name(uint8_t *product_name, size_t maxlen)
 
 size_t board_get_hardware_version(uavcan_HardwareVersion_t *hw_version)
 {
-	memset(hw_version, 0 , sizeof(uavcan_HardwareVersion_t));
+	memset(hw_version, 0, sizeof(uavcan_HardwareVersion_t));
 
 	hw_version->major = HW_VERSION_MAJOR;
 	hw_version->minor = HW_VERSION_MINOR;
diff --git a/src/drivers/boards/esc35-v1/bootloader/led.c b/src/drivers/boards/esc35-v1/bootloader/led.c
index c398f116ba..dfffe1b224 100644
--- a/src/drivers/boards/esc35-v1/bootloader/led.c
+++ b/src/drivers/boards/esc35-v1/bootloader/led.c
@@ -46,7 +46,7 @@
 #define TMR_REG(o)      (TMR_BASE+(o))
 
 
-void rgb_led(int r, int g , int b, int freqs)
+void rgb_led(int r, int g, int b, int freqs)
 {
 
 	long fosc = TMR_FREQUENCY;
diff --git a/src/drivers/boards/esc35-v1/bootloader/led.h b/src/drivers/boards/esc35-v1/bootloader/led.h
index 925be81de6..df742ff0ec 100644
--- a/src/drivers/boards/esc35-v1/bootloader/led.h
+++ b/src/drivers/boards/esc35-v1/bootloader/led.h
@@ -34,5 +34,5 @@
 #include <systemlib/visibility.h>
 
 __BEGIN_DECLS
-void rgb_led(int r, int g , int b, int freqs);
+void rgb_led(int r, int g, int b, int freqs);
 __END_DECLS
diff --git a/src/drivers/boards/px4cannode-v1/bootloader/boot.c b/src/drivers/boards/px4cannode-v1/bootloader/boot.c
index 6b7e9eaa3c..1ba0bfcae1 100644
--- a/src/drivers/boards/px4cannode-v1/bootloader/boot.c
+++ b/src/drivers/boards/px4cannode-v1/bootloader/boot.c
@@ -163,7 +163,7 @@ uint8_t board_get_product_name(uint8_t *product_name, size_t maxlen)
 
 size_t board_get_hardware_version(uavcan_HardwareVersion_t *hw_version)
 {
-	memset(hw_version, 0 , sizeof(uavcan_HardwareVersion_t));
+	memset(hw_version, 0, sizeof(uavcan_HardwareVersion_t));
 
 	hw_version->major = HW_VERSION_MAJOR;
 	hw_version->minor = HW_VERSION_MINOR;
diff --git a/src/drivers/boards/px4cannode-v1/bootloader/led.c b/src/drivers/boards/px4cannode-v1/bootloader/led.c
index f1599962f5..5cb9203a5c 100644
--- a/src/drivers/boards/px4cannode-v1/bootloader/led.c
+++ b/src/drivers/boards/px4cannode-v1/bootloader/led.c
@@ -46,7 +46,7 @@
 #define TMR_REG(o)      (TMR_BASE+(o))
 
 
-void rgb_led(int r, int g , int b, int freqs)
+void rgb_led(int r, int g, int b, int freqs)
 {
 
 	long fosc = TMR_FREQUENCY;
diff --git a/src/drivers/boards/px4cannode-v1/bootloader/led.h b/src/drivers/boards/px4cannode-v1/bootloader/led.h
index 1f0e67734e..d00935a954 100644
--- a/src/drivers/boards/px4cannode-v1/bootloader/led.h
+++ b/src/drivers/boards/px4cannode-v1/bootloader/led.h
@@ -34,5 +34,5 @@
 #include <systemlib/visibility.h>
 
 __BEGIN_DECLS
-void rgb_led(int r, int g , int b, int freqs);
+void rgb_led(int r, int g, int b, int freqs);
 __END_DECLS
diff --git a/src/drivers/boards/px4esc-v1/bootloader/boot.c b/src/drivers/boards/px4esc-v1/bootloader/boot.c
index b0e26e524e..8d3f2f317d 100644
--- a/src/drivers/boards/px4esc-v1/bootloader/boot.c
+++ b/src/drivers/boards/px4esc-v1/bootloader/boot.c
@@ -162,7 +162,7 @@ uint8_t board_get_product_name(uint8_t *product_name, size_t maxlen)
 
 size_t board_get_hardware_version(uavcan_HardwareVersion_t *hw_version)
 {
-	memset(hw_version, 0 , sizeof(uavcan_HardwareVersion_t));
+	memset(hw_version, 0, sizeof(uavcan_HardwareVersion_t));
 
 	hw_version->major = HW_VERSION_MAJOR;
 	hw_version->minor = HW_VERSION_MINOR;
diff --git a/src/drivers/boards/px4esc-v1/bootloader/led.c b/src/drivers/boards/px4esc-v1/bootloader/led.c
index becd712995..6ca185d6c7 100644
--- a/src/drivers/boards/px4esc-v1/bootloader/led.c
+++ b/src/drivers/boards/px4esc-v1/bootloader/led.c
@@ -46,7 +46,7 @@
 #define TMR_REG(o)      (TMR_BASE+(o))
 
 
-void rgb_led(int r, int g , int b, int freqs)
+void rgb_led(int r, int g, int b, int freqs)
 {
 
 	long fosc = TMR_FREQUENCY;
diff --git a/src/drivers/boards/px4esc-v1/bootloader/led.h b/src/drivers/boards/px4esc-v1/bootloader/led.h
index 1f0e67734e..d00935a954 100644
--- a/src/drivers/boards/px4esc-v1/bootloader/led.h
+++ b/src/drivers/boards/px4esc-v1/bootloader/led.h
@@ -34,5 +34,5 @@
 #include <systemlib/visibility.h>
 
 __BEGIN_DECLS
-void rgb_led(int r, int g , int b, int freqs);
+void rgb_led(int r, int g, int b, int freqs);
 __END_DECLS
diff --git a/src/drivers/boards/px4flow-v2/bootloader/boot.c b/src/drivers/boards/px4flow-v2/bootloader/boot.c
index c0022af879..8c1db0f9ec 100644
--- a/src/drivers/boards/px4flow-v2/bootloader/boot.c
+++ b/src/drivers/boards/px4flow-v2/bootloader/boot.c
@@ -162,7 +162,7 @@ uint8_t board_get_product_name(uint8_t *product_name, size_t maxlen)
 
 size_t board_get_hardware_version(uavcan_HardwareVersion_t *hw_version)
 {
-	memset(hw_version, 0 , sizeof(uavcan_HardwareVersion_t));
+	memset(hw_version, 0, sizeof(uavcan_HardwareVersion_t));
 
 	hw_version->major = HW_VERSION_MAJOR;
 	hw_version->minor = HW_VERSION_MINOR;
@@ -196,18 +196,18 @@ typedef struct packed_struct led_t {
 
 static const  led_t i2l[] = {
 
-	led(0, off,                            0   , 0  , 0   , 0),
-	led(1, reset,                          10  , 63 , 31 , 255),
-	led(2, autobaud_start,                 0   , 63 , 0   , 1),
-	led(3, autobaud_end,                   0   , 63 , 0   , 2),
-	led(4, allocation_start,               0   , 0  , 31  , 2),
-	led(5, allocation_end,                 0   , 63 , 31  , 3),
-	led(6, fw_update_start,                15  , 63 , 31  , 3),
-	led(7, fw_update_erase_fail,           15  , 63 , 15  , 3),
-	led(8, fw_update_invalid_response,     31  , 0   , 0  , 1),
-	led(9, fw_update_timeout,              31  , 0   , 0  , 2),
-	led(a, fw_update_invalid_crc,          31  , 0   , 0  , 4),
-	led(b, jump_to_app,                    0   , 63 , 0   , 10),
+	led(0, off,                            0, 0, 0, 0),
+	led(1, reset,                          10, 63, 31, 255),
+	led(2, autobaud_start,                 0, 63, 0, 1),
+	led(3, autobaud_end,                   0, 63, 0, 2),
+	led(4, allocation_start,               0, 0, 31, 2),
+	led(5, allocation_end,                 0, 63, 31, 3),
+	led(6, fw_update_start,                15, 63, 31, 3),
+	led(7, fw_update_erase_fail,           15, 63, 15, 3),
+	led(8, fw_update_invalid_response,     31, 0, 0, 1),
+	led(9, fw_update_timeout,              31, 0, 0, 2),
+	led(a, fw_update_invalid_crc,          31, 0, 0, 4),
+	led(b, jump_to_app,                    0, 63, 0, 10),
 
 };
 
diff --git a/src/drivers/boards/px4flow-v2/bootloader/led.c b/src/drivers/boards/px4flow-v2/bootloader/led.c
index d8b2b0c807..14ac133419 100644
--- a/src/drivers/boards/px4flow-v2/bootloader/led.c
+++ b/src/drivers/boards/px4flow-v2/bootloader/led.c
@@ -46,7 +46,7 @@
 #define TMR_FREQUENCY   STM32_APB2_TIM1_CLKIN
 #define TMR_REG(o)      (TMR_BASE+(o))
 
-void rgb_led(int r, int g , int b, int freqs)
+void rgb_led(int r, int g, int b, int freqs)
 {
 
 	long fosc = TMR_FREQUENCY;
diff --git a/src/drivers/boards/px4flow-v2/bootloader/led.h b/src/drivers/boards/px4flow-v2/bootloader/led.h
index 1f0e67734e..d00935a954 100644
--- a/src/drivers/boards/px4flow-v2/bootloader/led.h
+++ b/src/drivers/boards/px4flow-v2/bootloader/led.h
@@ -34,5 +34,5 @@
 #include <systemlib/visibility.h>
 
 __BEGIN_DECLS
-void rgb_led(int r, int g , int b, int freqs);
+void rgb_led(int r, int g, int b, int freqs);
 __END_DECLS
diff --git a/src/drivers/boards/s2740vc-v1/bootloader/boot.c b/src/drivers/boards/s2740vc-v1/bootloader/boot.c
index 2267ece542..11fd5c50e6 100644
--- a/src/drivers/boards/s2740vc-v1/bootloader/boot.c
+++ b/src/drivers/boards/s2740vc-v1/bootloader/boot.c
@@ -165,7 +165,7 @@ uint8_t board_get_product_name(uint8_t *product_name, size_t maxlen)
 
 size_t board_get_hardware_version(uavcan_HardwareVersion_t *hw_version)
 {
-	memset(hw_version, 0 , sizeof(uavcan_HardwareVersion_t));
+	memset(hw_version, 0, sizeof(uavcan_HardwareVersion_t));
 
 	hw_version->major = HW_VERSION_MAJOR;
 	hw_version->minor = HW_VERSION_MINOR;
diff --git a/src/drivers/boards/sitl/sitl_led.c b/src/drivers/boards/sitl/sitl_led.c
index 53d033234f..4c43ffc578 100644
--- a/src/drivers/boards/sitl/sitl_led.c
+++ b/src/drivers/boards/sitl/sitl_led.c
@@ -48,7 +48,7 @@ extern void led_off(int led);
 extern void led_toggle(int led);
 __END_DECLS
 
-static bool _led_state[2] = { false , false };
+static bool _led_state[2] = { false, false };
 
 __EXPORT void led_init()
 {
diff --git a/src/drivers/boards/zubaxgnss-v1/bootloader/boot.c b/src/drivers/boards/zubaxgnss-v1/bootloader/boot.c
index 961c706aff..ef086bcec8 100644
--- a/src/drivers/boards/zubaxgnss-v1/bootloader/boot.c
+++ b/src/drivers/boards/zubaxgnss-v1/bootloader/boot.c
@@ -165,7 +165,7 @@ uint8_t board_get_product_name(uint8_t *product_name, size_t maxlen)
 
 size_t board_get_hardware_version(uavcan_HardwareVersion_t *hw_version)
 {
-	memset(hw_version, 0 , sizeof(uavcan_HardwareVersion_t));
+	memset(hw_version, 0, sizeof(uavcan_HardwareVersion_t));
 
 	hw_version->major = HW_VERSION_MAJOR;
 	hw_version->minor = HW_VERSION_MINOR;