diff --git a/platforms/chibios/drivers/serial_usart.c b/platforms/chibios/drivers/serial_usart.c
index 2ef1864d0ef..0ce1659deff 100644
--- a/platforms/chibios/drivers/serial_usart.c
+++ b/platforms/chibios/drivers/serial_usart.c
@@ -14,7 +14,7 @@ static QMKSerialConfig serial_config = {
 #    if HAL_USE_SERIAL
     .speed = (SERIAL_USART_SPEED),
 #    else
-    .baud = (SERIAL_USART_SPEED),
+    .baud  = (SERIAL_USART_SPEED),
 #    endif
     .ctrl1 = (SERIAL_USART_CTRL1),
     .ctrl2 = (SERIAL_USART_CTRL2),
diff --git a/platforms/chibios/drivers/spi_master.c b/platforms/chibios/drivers/spi_master.c
index 43e88d9e867..18fc9b7ac1d 100644
--- a/platforms/chibios/drivers/spi_master.c
+++ b/platforms/chibios/drivers/spi_master.c
@@ -311,11 +311,11 @@ bool spi_start_extended(spi_start_config_t *start_config) {
     switch (roundedDivisor) {
         case 2:
             break;
-#if defined(AT32F402_405)
+#    if defined(AT32F402_405)
         case 3:
             spiConfig.ctrl2 |= SPI_CTRL2_MDIV3EN;
             break;
-#endif
+#    endif
         case 4:
             spiConfig.ctrl1 |= SPI_CTRL1_MDIV_0;
             break;
diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c
index 80cab12a48a..e5adea9ac88 100644
--- a/platforms/chibios/drivers/ws2812_pwm.c
+++ b/platforms/chibios/drivers/ws2812_pwm.c
@@ -41,13 +41,13 @@
 #    error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM?_UP"
 #endif
 #if defined(AT32F415)
-#if (AT32_DMA_SUPPORTS_DMAMUX == TRUE) && !defined(WS2812_PWM_DMAMUX_CHANNEL) && !defined(WS2812_PWM_DMAMUX_ID)
-#    error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_PWM_DMAMUX_CHANNEL 1, #define WS2812_PWM_DMAMUX_ID AT32_DMAMUX_TMR?_OVERFLOW"
-#endif
+#    if (AT32_DMA_SUPPORTS_DMAMUX == TRUE) && !defined(WS2812_PWM_DMAMUX_CHANNEL) && !defined(WS2812_PWM_DMAMUX_ID)
+#        error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_PWM_DMAMUX_CHANNEL 1, #define WS2812_PWM_DMAMUX_ID AT32_DMAMUX_TMR?_OVERFLOW"
+#    endif
 #else
-#if (AT32_DMA_SUPPORTS_DMAMUX == TRUE) && !defined(WS2812_PWM_DMAMUX_ID)
-#    error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_PWM_DMAMUX_ID AT32_DMAMUX_TMR?_OVERFLOW"
-#endif
+#    if (AT32_DMA_SUPPORTS_DMAMUX == TRUE) && !defined(WS2812_PWM_DMAMUX_ID)
+#        error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_PWM_DMAMUX_ID AT32_DMAMUX_TMR?_OVERFLOW"
+#    endif
 #endif
 
 /* Summarize https://www.st.com/resource/en/application_note/an4013-stm32-crossseries-timer-overview-stmicroelectronics.pdf to
@@ -363,15 +363,15 @@ void ws2812_init(void) {
 #endif
 
 #if defined(AT32F415)
-#if (AT32_DMA_SUPPORTS_DMAMUX == TRUE)
+#    if (AT32_DMA_SUPPORTS_DMAMUX == TRUE)
     // If the MCU has a DMAMUX we need to assign the correct resource
     dmaSetRequestSource(WS2812_PWM_DMA_STREAM, WS2812_PWM_DMAMUX_CHANNEL, WS2812_PWM_DMAMUX_ID);
-#endif
+#    endif
 #else
-#if (AT32_DMA_SUPPORTS_DMAMUX == TRUE)
+#    if (AT32_DMA_SUPPORTS_DMAMUX == TRUE)
     // If the MCU has a DMAMUX we need to assign the correct resource
     dmaSetRequestSource(WS2812_PWM_DMA_STREAM, WS2812_PWM_DMAMUX_ID);
-#endif
+#    endif
 #endif
 
     // Start DMA
diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c
index dab80e2a75e..633786462c2 100644
--- a/platforms/chibios/drivers/ws2812_spi.c
+++ b/platforms/chibios/drivers/ws2812_spi.c
@@ -43,10 +43,10 @@
 #if defined(AT32F402_405) || defined(AT32F415)
 #    if WS2812_SPI_DIVISOR == 2
 #        define WS2812_SPI_DIVISOR_CTRL1_MDIV_X (0)
-#if defined(AT32F402_405)
-#    elif WS2812_SPI_DIVISOR == 3
-#        define WS2812_SPI_DIVISOR_CTRL2_MDIV_X (SPI_CTRL2_MDIV3EN)
-#endif
+#        if defined(AT32F402_405)
+#        elif WS2812_SPI_DIVISOR == 3
+#            define WS2812_SPI_DIVISOR_CTRL2_MDIV_X (SPI_CTRL2_MDIV3EN)
+#        endif
 #    elif WS2812_SPI_DIVISOR == 4
 #        define WS2812_SPI_DIVISOR_CTRL1_MDIV_X (SPI_CTRL1_MDIV_0)
 #    elif WS2812_SPI_DIVISOR == 8