diff --git a/configs/sama5d3-xplained/src/sam_ethernet.c b/configs/sama5d3-xplained/src/sam_ethernet.c
index 2307410a380..9a14e3d6379 100644
--- a/configs/sama5d3-xplained/src/sam_ethernet.c
+++ b/configs/sama5d3-xplained/src/sam_ethernet.c
@@ -317,7 +317,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   flags = irqsave();
 
-  /* Get the old button interrupt handler and save the new one */
+  /* Get the old interrupt handler and save the new one */
 
   oldhandler = *phandler;
   *phandler = handler;
@@ -350,7 +350,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
       *enable = enabler;
     }
 
-  /* Return the old button handler (so that it can be restored) */
+  /* Return the old handler (so that it can be restored) */
 
   irqrestore(flags);
   return oldhandler;
diff --git a/configs/sama5d3-xplained/src/sam_usb.c b/configs/sama5d3-xplained/src/sam_usb.c
index 1105d88092a..29f7dfc7f2f 100644
--- a/configs/sama5d3-xplained/src/sam_usb.c
+++ b/configs/sama5d3-xplained/src/sam_usb.c
@@ -486,7 +486,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler)
 
   flags = irqsave();
 
-  /* Get the old button interrupt handler and save the new one */
+  /* Get the old interrupt handler and save the new one */
 
   oldhandler  = g_ochandler;
   g_ochandler = handler;
@@ -497,7 +497,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler)
   (void)irq_attach(IRQ_USBBC_VBUS_OVERCURRENT, handler);
   sam_pioirqenable(IRQ_USBBC_VBUS_OVERCURRENT);
 
-  /* Return the old button handler (so that it can be restored) */
+  /* Return the old handler (so that it can be restored) */
 
   irqrestore(flags);
   return oldhandler;
diff --git a/configs/sama5d3x-ek/src/sam_ethernet.c b/configs/sama5d3x-ek/src/sam_ethernet.c
index e2a252e45c8..ccc5e2e28e8 100644
--- a/configs/sama5d3x-ek/src/sam_ethernet.c
+++ b/configs/sama5d3x-ek/src/sam_ethernet.c
@@ -317,7 +317,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   flags = irqsave();
 
-  /* Get the old button interrupt handler and save the new one */
+  /* Get the old interrupt handler and save the new one */
 
   oldhandler = *phandler;
   *phandler = handler;
@@ -350,7 +350,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
       *enable = enabler;
     }
 
-  /* Return the old button handler (so that it can be restored) */
+  /* Return the old handler (so that it can be restored) */
 
   irqrestore(flags);
   return oldhandler;
diff --git a/configs/sama5d3x-ek/src/sam_usb.c b/configs/sama5d3x-ek/src/sam_usb.c
index 7104253cd2d..f46da45e78d 100644
--- a/configs/sama5d3x-ek/src/sam_usb.c
+++ b/configs/sama5d3x-ek/src/sam_usb.c
@@ -486,7 +486,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler)
 
   flags = irqsave();
 
-  /* Get the old button interrupt handler and save the new one */
+  /* Get the old interrupt handler and save the new one */
 
   oldhandler  = g_ochandler;
   g_ochandler = handler;
@@ -497,7 +497,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler)
   (void)irq_attach(IRQ_USBBC_VBUS_OVERCURRENT, handler);
   sam_pioirqenable(IRQ_USBBC_VBUS_OVERCURRENT);
 
-  /* Return the old button handler (so that it can be restored) */
+  /* Return the old handler (so that it can be restored) */
 
   irqrestore(flags);
   return oldhandler;
diff --git a/configs/sama5d4-ek/src/sam_ethernet.c b/configs/sama5d4-ek/src/sam_ethernet.c
index a2eb1b1c533..6c9c4b890d9 100644
--- a/configs/sama5d4-ek/src/sam_ethernet.c
+++ b/configs/sama5d4-ek/src/sam_ethernet.c
@@ -286,7 +286,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
 
   flags = irqsave();
 
-  /* Get the old button interrupt handler and save the new one */
+  /* Get the old interrupt handler and save the new one */
 
   oldhandler = *phandler;
   *phandler  = handler;
@@ -319,7 +319,7 @@ xcpt_t arch_phy_irq(FAR const char *intf, xcpt_t handler, phy_enable_t *enable)
       *enable = enabler;
     }
 
-  /* Return the old button handler (so that it can be restored) */
+  /* Return the old handler (so that it can be restored) */
 
   irqrestore(flags);
   return oldhandler;
diff --git a/configs/sama5d4-ek/src/sam_usb.c b/configs/sama5d4-ek/src/sam_usb.c
index f8d2da7d287..1d34bd84ea4 100644
--- a/configs/sama5d4-ek/src/sam_usb.c
+++ b/configs/sama5d4-ek/src/sam_usb.c
@@ -487,7 +487,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler)
 
   flags = irqsave();
 
-  /* Get the old button interrupt handler and save the new one */
+  /* Get the old interrupt handler and save the new one */
 
   oldhandler  = g_ochandler;
   g_ochandler = handler;
@@ -498,7 +498,7 @@ xcpt_t sam_setup_overcurrent(xcpt_t handler)
   (void)irq_attach(IRQ_USBBC_VBUS_OVERCURRENT, handler);
   sam_pioirqenable(IRQ_USBBC_VBUS_OVERCURRENT);
 
-  /* Return the old button handler (so that it can be restored) */
+  /* Return the old handler (so that it can be restored) */
 
   irqrestore(flags);
   return oldhandler;