diff --git a/arch/arm/src/stm32l4/chip/stm32l4_comp.h b/arch/arm/src/stm32l4/chip/stm32l4_comp.h
index 3f0b4ceeec..a09c682652 100644
--- a/arch/arm/src/stm32l4/chip/stm32l4_comp.h
+++ b/arch/arm/src/stm32l4/chip/stm32l4_comp.h
@@ -69,19 +69,11 @@
 #  define COMP_CSR_INMSEL_VREF     (3 << COMP_CSR_INMSEL_SHIFT) /* VREFINT */
 #  define COMP_CSR_INMSEL_DAC1     (4 << COMP_CSR_INMSEL_SHIFT) /* DAC Channel1 */
 #  define COMP_CSR_INMSEL_DAC2     (5 << COMP_CSR_INMSEL_SHIFT) /* DAC Channel2 */
-#  define COMP_CSR_INMSEL_PIN1     (6 << COMP_CSR_INMSEL_SHIFT) /* Input minus pin 1 */
-#  define COMP_CSR_INMSEL_PIN2     (7 << COMP_CSR_INMSEL_SHIFT) /* Input minus pin 2 */
-#  define COMP1_CSR_INMSEL_PB1     (6 << COMP_CSR_INMSEL_SHIFT) /* PB1 */
-#  define COMP1_CSR_INMSEL_PC4     (7 << COMP_CSR_INMSEL_SHIFT) /* PC4 */
-#  define COMP2_CSR_INMSEL_PB3     (6 << COMP_CSR_INMSEL_SHIFT) /* PB3 */
-#  define COMP2_CSR_INMSEL_PB7     (7 << COMP_CSR_INMSEL_SHIFT) /* PB7 */
+#  define COMP_CSR_INMSEL_PIN1     (6 << COMP_CSR_INMSEL_SHIFT) /* Input minus pin 1: COMP1=PB1; COMP2=PB3 */
+#  define COMP_CSR_INMSEL_PIN2     (7 << COMP_CSR_INMSEL_SHIFT) /* Input minus pin 2: COMP1=PC4; COMP2=PB7 */
 #define COMP_CSR_INPSEL_MASK       (1 << 7)  /* Bit 7:  Input plus selection bit */
-#  define COMP1_CSR_INPSEL_PIN1     (0)
-#  define COMP1_CSR_INPSEL_PIN2    COMP_CSR_INPSEL_MASK
-#  define COMP1_CSR_INPSEL_PC5     (0)
-#  define COMP1_CSR_INPSEL_PB2     COMP_CSR_INPSEL_MASK
-#  define COMP2_CSR_INPSEL_PB4     (0)
-#  define COMP2_CSR_INPSEL_PB6     COMP_CSR_INPSEL_MASK
+#  define COMP_CSR_INPSEL_PIN1     (0)                          /* Input plus pin 1: COMP1=PC5; COMP2=PB4 */
+#  define COMP_CSR_INPSEL_PIN2     COMP_CSR_INPSEL_MASK         /* Input plus pin 1: COMP1=PB2; COMP2=PB6 */
 #define COMP2_CSR_WINMODE          (1 << 9)  /* Bit 9:  Windows mode selection bit (COMP2 only) */
 #  define COMP2_CSR_WINMODE_NOCONN (0)                /* Comparator 2 input not connected to Comparator 1 */
 #  define COMP2_CSR_WINMODE_CONN   COMP2_CSR_WINMODE  /* Comparator 2 input connected to Comparator 1 */
diff --git a/arch/arm/src/stm32l4/stm32l4_comp.c b/arch/arm/src/stm32l4/stm32l4_comp.c
index 1bb374b6bf..518e648639 100644
--- a/arch/arm/src/stm32l4/stm32l4_comp.c
+++ b/arch/arm/src/stm32l4/stm32l4_comp.c
@@ -107,18 +107,18 @@ int stm32l4_compconfig(int cmp, const struct stm32l4_comp_config_s *cfg)
     {
     case STM32L4_COMP_INP_PIN_1:
       stm32l4_configgpio(cmp == STM32L4_COMP1 ? GPIO_COMP1_INP_1 : GPIO_COMP2_INP_1);
-      regval |= COMP1_CSR_INPSEL_PIN1;
+      regval |= COMP_CSR_INPSEL_PIN1;
       break;
 
     case STM32L4_COMP_INP_PIN_2:
       stm32l4_configgpio(cmp == STM32L4_COMP1 ? GPIO_COMP1_INP_2 : GPIO_COMP2_INP_2);
-      regval |= COMP1_CSR_INPSEL_PIN2;
+      regval |= COMP_CSR_INPSEL_PIN2;
       break;
 
 #if defined(CONFIG_STM32L4_STM32L4X3)
     case STM32L4_COMP_INP_PIN_3:
       stm32l4_configgpio(cmp == STM32L4_COMP1 ? GPIO_COMP1_INP_3 : GPIO_COMP2_INP_3);
-      regval |= COMP1_CSR_INPSEL_PIN3;
+      regval |= COMP_CSR_INPSEL_PIN3;
       break;
 #endif