diff --git a/configs/nucleo-f072rb/src/stm32_userleds.c b/configs/nucleo-f072rb/src/stm32_userleds.c
index 0b967fc662..8febc96b46 100644
--- a/configs/nucleo-f072rb/src/stm32_userleds.c
+++ b/configs/nucleo-f072rb/src/stm32_userleds.c
@@ -181,9 +181,9 @@ void board_userled_initialize(void)
 
 void board_userled(int led, bool ledon)
 {
-  if (led == 1)
+  if (led == BOARD_LD2)
     {
-      stm32f0_gpiowrite(GPIO_LD2, ldeon);
+      stm32f0_gpiowrite(GPIO_LD2, ledon);
     }
 }
 
@@ -193,10 +193,7 @@ void board_userled(int led, bool ledon)
 
 void board_userled_all(uint8_t ledset)
 {
-  if (led == 1)
-    {
-      stm32f0_gpiowrite(GPIO_LD2, (ledset & BOARD_LD2_BIT) != 0);
-    }
+  stm32f0_gpiowrite(GPIO_LD2, (ledset & BOARD_LD2_BIT) != 0);
 }
 
 /****************************************************************************
diff --git a/configs/nucleo-f091rc/src/stm32_userleds.c b/configs/nucleo-f091rc/src/stm32_userleds.c
index b13c1882b7..f62e84a30e 100644
--- a/configs/nucleo-f091rc/src/stm32_userleds.c
+++ b/configs/nucleo-f091rc/src/stm32_userleds.c
@@ -181,9 +181,9 @@ void board_userled_initialize(void)
 
 void board_userled(int led, bool ledon)
 {
-  if (led == 1)
+  if (led == BOARD_LD2)
     {
-      stm32f0_gpiowrite(GPIO_LD2, ldeon);
+      stm32f0_gpiowrite(GPIO_LD2, ledon);
     }
 }
 
@@ -193,10 +193,7 @@ void board_userled(int led, bool ledon)
 
 void board_userled_all(uint8_t ledset)
 {
-  if (led == 1)
-    {
-      stm32f0_gpiowrite(GPIO_LD2, (ledset & BOARD_LD2_BIT) != 0);
-    }
+  stm32f0_gpiowrite(GPIO_LD2, (ledset & BOARD_LD2_BIT) != 0);
 }
 
 /****************************************************************************
diff --git a/configs/nucleo-f410rb/src/stm32_userleds.c b/configs/nucleo-f410rb/src/stm32_userleds.c
index bdd1be2b18..fb283a50cc 100644
--- a/configs/nucleo-f410rb/src/stm32_userleds.c
+++ b/configs/nucleo-f410rb/src/stm32_userleds.c
@@ -181,9 +181,9 @@ void board_userled_initialize(void)
 
 void board_userled(int led, bool ledon)
 {
-  if (led == 1)
+  if (led == BOARD_LD2)
     {
-      stm32_gpiowrite(GPIO_LD2, ldeon);
+      stm32_gpiowrite(GPIO_LD2, ledon);
     }
 }
 
@@ -193,10 +193,7 @@ void board_userled(int led, bool ledon)
 
 void board_userled_all(uint8_t ledset)
 {
-  if (led == 1)
-    {
-      stm32_gpiowrite(GPIO_LD2, (ledset & BOARD_LD2_BIT) != 0);
-    }
+  stm32_gpiowrite(GPIO_LD2, (ledset & BOARD_LD2_BIT) != 0);
 }
 
 /****************************************************************************
diff --git a/configs/nucleo-l452re/src/stm32_userleds.c b/configs/nucleo-l452re/src/stm32_userleds.c
index 77ba277c34..4ed1b8d807 100644
--- a/configs/nucleo-l452re/src/stm32_userleds.c
+++ b/configs/nucleo-l452re/src/stm32_userleds.c
@@ -181,9 +181,9 @@ void board_userled_initialize(void)
 
 void board_userled(int led, bool ledon)
 {
-  if (led == 1)
+  if (led == BOARD_LD2)
     {
-      stm32l4_gpiowrite(GPIO_LD2, ldeon);
+      stm32l4_gpiowrite(GPIO_LD2, ledon);
     }
 }
 
@@ -193,10 +193,7 @@ void board_userled(int led, bool ledon)
 
 void board_userled_all(uint8_t ledset)
 {
-  if (led == 1)
-    {
-      stm32l4_gpiowrite(GPIO_LD2, (ledset & BOARD_LD2_BIT) != 0);
-    }
+  stm32l4_gpiowrite(GPIO_LD2, (ledset & BOARD_LD2_BIT) != 0);
 }
 
 /****************************************************************************
diff --git a/configs/nucleo-l476rg/src/stm32_userleds.c b/configs/nucleo-l476rg/src/stm32_userleds.c
index 53d9193230..9464a6ad34 100644
--- a/configs/nucleo-l476rg/src/stm32_userleds.c
+++ b/configs/nucleo-l476rg/src/stm32_userleds.c
@@ -172,7 +172,7 @@ void board_userled_initialize(void)
 {
   /* Configure LD2 GPIO for output */
 
-  stm32_configgpio(GPIO_LD2);
+  stm32l4_configgpio(GPIO_LD2);
 }
 
 /****************************************************************************
@@ -181,9 +181,9 @@ void board_userled_initialize(void)
 
 void board_userled(int led, bool ledon)
 {
-  if (led == 1)
+  if (led == BOARD_LD2)
     {
-      stm32_gpiowrite(GPIO_LD2, ldeon);
+      stm32l4_gpiowrite(GPIO_LD2, ledon);
     }
 }
 
@@ -193,10 +193,7 @@ void board_userled(int led, bool ledon)
 
 void board_userled_all(uint8_t ledset)
 {
-  if (led == 1)
-    {
-      stm32_gpiowrite(GPIO_LD2, (ledset & BOARD_LD2_BIT) != 0);
-    }
+  stm32l4_gpiowrite(GPIO_LD2, (ledset & BOARD_LD2_BIT) != 0);
 }
 
 /****************************************************************************
diff --git a/configs/stm32l476vg-disco/src/stm32_userleds.c b/configs/stm32l476vg-disco/src/stm32_userleds.c
index 4bee92bde8..f1b27fb26f 100644
--- a/configs/stm32l476vg-disco/src/stm32_userleds.c
+++ b/configs/stm32l476vg-disco/src/stm32_userleds.c
@@ -192,11 +192,11 @@ void board_userled(int led, bool ledon)
   switch (led)
   {
   case BOARD_LED_RED:
-    stm32l4_gpiowrite(GPIO_LED_RED, ldeon);
+    stm32l4_gpiowrite(GPIO_LED_RED, ledon);
     break;
 
   case BOARD_LED_GRN:
-    stm32l4_gpiowrite(GPIO_LED_GRN, ldeon);
+    stm32l4_gpiowrite(GPIO_LED_GRN, ledon);
     break;
   }
 }