diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F0/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F0/spi_api.c
index 66117600b4..3aa5eb402d 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F0/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F0/spi_api.c
@@ -102,9 +102,8 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
 
     if (ssel != NC) {
         pinmap_pinout(ssel, PinMap_SPI_SSEL);
-    }
-    else {
-         obj->nss = SPI_NSS_SOFT;
+    } else {
+        obj->nss = SPI_NSS_SOFT;
     }
 
     init_spi(obj);
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F1/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F1/spi_api.c
index 73da9f9a40..90aa5cced2 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F1/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F1/spi_api.c
@@ -102,9 +102,8 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
 
     if (ssel != NC) {
         pinmap_pinout(ssel, PinMap_SPI_SSEL);
-    }
-    else {
-         obj->nss = SPI_NSS_SOFT;
+    } else {
+        obj->nss = SPI_NSS_SOFT;
     }
 
     init_spi(obj);
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3/spi_api.c
index b2725fb937..c215b501af 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3/spi_api.c
@@ -117,9 +117,8 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
 
     if (ssel != NC) {
         pinmap_pinout(ssel, PinMap_SPI_SSEL);
-    }
-    else {
-         obj->nss = SPI_NSS_SOFT;
+    } else {
+        obj->nss = SPI_NSS_SOFT;
     }
 
     init_spi(obj);
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c
index 0812487363..1eedb88dac 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F3XX/spi_api.c
@@ -125,9 +125,8 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
 
     if (ssel != NC) {
         pinmap_pinout(ssel, PinMap_SPI_SSEL);
-    }
-    else {
-         obj->nss = SPI_NSS_SOFT;
+    } else {
+        obj->nss = SPI_NSS_SOFT;
     }
 
     init_spi(obj);
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/spi_api.c
index aa50219ce9..260162d5a8 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/spi_api.c
@@ -119,9 +119,8 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
 
     if (ssel != NC) {
         pinmap_pinout(ssel, PinMap_SPI_SSEL);
-    }
-    else {
-         obj->nss = SPI_NSS_SOFT;
+    } else {
+        obj->nss = SPI_NSS_SOFT;
     }
 
     init_spi(obj);
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c
index c01edad935..b88b3af709 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4XX/spi_api.c
@@ -99,8 +99,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
     pinmap_pinout(sclk, PinMap_SPI_SCLK);
     if (ssel != NC) {
         pinmap_pinout(ssel, PinMap_SPI_SSEL);
-    }
-    else {
+    } else {
         // Use software slave management
         obj->spi->CR1 |= SPI_CR1_SSM | SPI_CR1_SSI;
     }
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32L0/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32L0/spi_api.c
index b6639ba291..baa4e6e2bf 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32L0/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32L0/spi_api.c
@@ -102,9 +102,8 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
 
     if (ssel != NC) {
         pinmap_pinout(ssel, PinMap_SPI_SSEL);
-    }
-    else {
-         obj->nss = SPI_NSS_SOFT;
+    } else {
+        obj->nss = SPI_NSS_SOFT;
     }
 
     init_spi(obj);
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32L1/spi_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32L1/spi_api.c
index 8c8b65ae7e..a0429ac21d 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32L1/spi_api.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32L1/spi_api.c
@@ -105,9 +105,8 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
 
     if (ssel != NC) {
         pinmap_pinout(ssel, PinMap_SPI_SSEL);
-    }
-    else {
-         obj->nss = SPI_NSS_SOFT;
+    } else {
+        obj->nss = SPI_NSS_SOFT;
     }
 
     init_spi(obj);