diff --git a/targets/TARGET_STM/TARGET_STM32F3/spi_api.c b/targets/TARGET_STM/TARGET_STM32F3/spi_api.c
index c7082808e6..661c6a8b29 100644
--- a/targets/TARGET_STM/TARGET_STM32F3/spi_api.c
+++ b/targets/TARGET_STM/TARGET_STM32F3/spi_api.c
@@ -55,25 +55,31 @@ int spi_get_clock_freq(spi_t *obj) {
 	/* Get source clock depending on SPI instance */
     switch ((int)spiobj->spi) {
 #if defined SPI1_BASE
-	case SPI_1:
-			/* SPI_1. Source CLK is PCKL2 */
-			spi_hz = HAL_RCC_GetPCLK2Freq();
-			break;
+        case SPI_1:
+            /* SPI_1. Source CLK is PCKL2 */
+            spi_hz = HAL_RCC_GetPCLK2Freq();
+            break;
 #endif
 #if defined SPI2_BASE
-		case SPI_2:
+        case SPI_2:
+            /* SPI_2 and SPI_3. Source CLK is PCKL1 */
+            spi_hz = HAL_RCC_GetPCLK1Freq();
+            break;
 #endif
 #if defined SPI3_BASE
-		case SPI_3:
+        case SPI_3:
+            /* SPI_2 and SPI_3. Source CLK is PCKL1 */
+            spi_hz = HAL_RCC_GetPCLK1Freq();
+            break;
 #endif
 #if defined SPI4_BASE
-		case SPI_4:
+        case SPI_4:
+            /* SPI_4. Source CLK is PCKL2 */
+            spi_hz = HAL_RCC_GetPCLK2Freq();
+            break;
 #endif
-			/* SPI_2 and SPI_3. Source CLK is PCKL1 */
-			spi_hz = HAL_RCC_GetPCLK1Freq();
-			break;
-		default:
-			error("CLK: SPI instance not set");
+        default:
+            error("CLK: SPI instance not set");
             break;
     }
     return spi_hz;
diff --git a/targets/TARGET_STM/i2c_api.c b/targets/TARGET_STM/i2c_api.c
index e75801a8fc..1b2de788c2 100644
--- a/targets/TARGET_STM/i2c_api.c
+++ b/targets/TARGET_STM/i2c_api.c
@@ -492,14 +492,12 @@ int i2c_start(i2c_t *obj) {
 int i2c_stop(i2c_t *obj) {
     struct i2c_s *obj_s = I2C_S(obj);
     I2C_TypeDef *i2c = (I2C_TypeDef *)obj_s->i2c;
-    I2C_HandleTypeDef *handle = &(obj_s->handle);
-    int timeout;
 
     // Generate the STOP condition
     i2c->CR1 |= I2C_CR1_STOP;
 
     /*  In case of mixed usage of the APIs (unitary + SYNC)
-     *  re-inti HAL state
+     *  re-init HAL state
      */
     if(obj_s->XferOperation != I2C_FIRST_AND_LAST_FRAME)
             i2c_init(obj, obj_s->sda, obj_s->scl);