diff --git a/arch/arm/src/stm32/stm32_exti.h b/arch/arm/src/stm32/stm32_exti.h
index 6a34582c676..3a395abe372 100644
--- a/arch/arm/src/stm32/stm32_exti.h
+++ b/arch/arm/src/stm32/stm32_exti.h
@@ -1,7 +1,7 @@
 /************************************************************************************
  * arch/arm/src/stm32/stm32_exti.h
  *
- *   Copyright (C) 2009, 2012, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2009, 2012, 2015, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,7 @@ extern "C"
  *  - rising/falling edge: enables
  *  - event:  generate event when set
  *  - func:   when non-NULL, generate interrupt
+ *  - arg:    Argument passed to the interrupt callback
  *
  * Returns:
  *  The previous value of the interrupt handler function pointer.  This value may,
@@ -86,7 +87,7 @@ extern "C"
  ************************************************************************************/
 
 xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
-                          bool event, xcpt_t func);
+                          bool event, xcpt_t func, void *arg);
 
 /************************************************************************************
  * Name: stm32_exti_alarm
@@ -98,6 +99,7 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
  *  - rising/falling edge: enables interrupt on rising/falling edges
  *  - event:  generate event when set
  *  - func:   when non-NULL, generate interrupt
+ *  - arg:    Argument passed to the interrupt callback
  *
  * Returns:
  *   The previous value of the interrupt handler function pointer.  This value may,
@@ -107,7 +109,8 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
  ************************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
-xcpt_t stm32_exti_alarm(bool risingedge, bool fallingedge, bool event, xcpt_t func);
+xcpt_t stm32_exti_alarm(bool risingedge, bool fallingedge, bool event, xcpt_t func,
+                        void *arg);
 #endif
 
 #undef EXTERN
diff --git a/arch/arm/src/stm32/stm32_exti_alarm.c b/arch/arm/src/stm32/stm32_exti_alarm.c
index ba60faabe4a..67902e11c8e 100644
--- a/arch/arm/src/stm32/stm32_exti_alarm.c
+++ b/arch/arm/src/stm32/stm32_exti_alarm.c
@@ -59,7 +59,8 @@
 
 /* Interrupt handlers attached to the ALARM EXTI */
 
-static xcpt_t stm32_exti_callback;
+static xcpt_t g_alarm_callback;
+static void  *g_callback_arg;
 
 /****************************************************************************
  * Private Functions
@@ -83,9 +84,9 @@ static int stm32_exti_alarm_isr(int irq, void *context, FAR void *arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32_exti_callback)
+  if (g_alarm_callback)
     {
-      ret = stm32_exti_callback(irq, context);
+      ret = g_alarm_callback(irq, context, g_callback_arg);
     }
 
   return ret;
@@ -105,6 +106,7 @@ static int stm32_exti_alarm_isr(int irq, void *context, FAR void *arg)
  *  - rising/falling edge: enables interrupt on rising/falling edget
  *  - event:  generate event when set
  *  - func:   when non-NULL, generate interrupt
+ *  - arg:    Argument passed to the interrupt callback
  *
  * Returns:
  *   The previous value of the interrupt handler function pointer.  This
@@ -114,14 +116,15 @@ static int stm32_exti_alarm_isr(int irq, void *context, FAR void *arg)
  ****************************************************************************/
 
 xcpt_t stm32_exti_alarm(bool risingedge, bool fallingedge, bool event,
-                        xcpt_t func)
+                        xcpt_t func, void *arg)
 {
   xcpt_t oldhandler;
 
   /* Get the previous GPIO IRQ handler; Save the new IRQ handler. */
 
-  oldhandler          = stm32_exti_callback;
-  stm32_exti_callback = func;
+  oldhandler       = g_alarm_callback;
+  g_alarm_callback = func;
+  g_callback_arg   = arg;
 
   /* Install external interrupt handlers (if not already attached) */
 
diff --git a/arch/arm/src/stm32/stm32_exti_gpio.c b/arch/arm/src/stm32/stm32_exti_gpio.c
index dbf0691597f..86000eac762 100644
--- a/arch/arm/src/stm32/stm32_exti_gpio.c
+++ b/arch/arm/src/stm32/stm32_exti_gpio.c
@@ -55,13 +55,23 @@
 #include "stm32_gpio.h"
 #include "stm32_exti.h"
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct gpio_callback_s
+{
+  xcptr_t callback;
+  void   *arg;
+};
+
 /****************************************************************************
  * Private Data
  ****************************************************************************/
 
 /* Interrupt handlers attached to each EXTI */
 
-static xcpt_t stm32_exti_callbacks[16];
+static struct gpio_callback_s g_gpio_callbacks[16];
 
 /****************************************************************************
  * Private Functions
@@ -81,9 +91,12 @@ static int stm32_exti0_isr(int irq, void *context, FAR void *arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32_exti_callbacks[0])
+  if (g_gpio_callbacks[0].callback != NULL)
     {
-      ret = stm32_exti_callbacks[0](irq, context, arg);
+      xcpt_t callback = g_gpio_callbacks[0].callback;
+      void  *cbarg    = g_gpio_callbacks[0].arg;
+
+      ret = callback(irq, context, cbarg);
     }
 
   return ret;
@@ -99,9 +112,12 @@ static int stm32_exti1_isr(int irq, void *context, void *arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32_exti_callbacks[1])
+  if (g_gpio_callbacks[1].callback != NULL)
     {
-      ret = stm32_exti_callbacks[1](irq, context, arg);
+      xcpt_t callback = g_gpio_callbacks[1].callback;
+      void  *cbarg    = g_gpio_callbacks[1].arg;
+
+      ret = callback(irq, context, cbarg);
     }
 
   return ret;
@@ -117,9 +133,12 @@ static int stm32_exti2_isr(int irq, void *context, FAR void *arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32_exti_callbacks[2])
+  if (g_gpio_callbacks[2].callback != NULL)
     {
-      ret = stm32_exti_callbacks[2](irq, context, arg);
+      xcpt_t callback = g_gpio_callbacks[2].callback;
+      void  *cbarg    = g_gpio_callbacks[2].arg;
+
+      ret = callback(irq, context, cbarg);
     }
 
   return ret;
@@ -135,9 +154,12 @@ static int stm32_exti3_isr(int irq, void *context, void  * arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32_exti_callbacks[3])
+  if (g_gpio_callbacks[3].callback != NULL)
     {
-      ret = stm32_exti_callbacks[3](irq, context, arg);
+      xcpt_t callback = g_gpio_callbacks[3].callback;
+      void  *cbarg    = g_gpio_callbacks[3].arg;
+
+      ret = callback(irq, context, cbarg);
     }
 
   return ret;
@@ -153,9 +175,12 @@ static int stm32_exti4_isr(int irq, void *context, FAR void *arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32_exti_callbacks[4])
+  if (g_gpio_callbacks[4].callback != NULL)
     {
-      ret = stm32_exti_callbacks[4](irq, context, arg);
+      xcpt_t callback = g_gpio_callbacks[4].callback;
+      void  *cbarg    = g_gpio_callbacks[4].arg;
+
+      ret = callback(irq, context, cbarg);
     }
 
   return ret;
@@ -186,10 +211,14 @@ static int stm32_exti_multiisr(int irq, void *context, FAR void *arg, int first,
 
           /* And dispatch the interrupt to the handler */
 
-          if (stm32_exti_callbacks[pin])
+          if (g_gpio_callbacks[pin].callback != NULL)
             {
-              int tmp = stm32_exti_callbacks[pin](irq, context, arg);
-              if (tmp != OK)
+              xcpt_t callback = g_gpio_callbacks[pin].callback;
+              void  *cbarg    = g_gpio_callbacks[pin].arg;
+              int tmp;
+
+              tmp = callback(irq, context, cbarg);
+              if (tmp < 0)
                 {
                   ret = tmp;
                 }
@@ -226,6 +255,7 @@ static int stm32_exti1510_isr(int irq, void *context, void *arg)
  *  - fallingedge: Enables interrupt on falling edges
  *  - event:       Generate event when set
  *  - func:        When non-NULL, generate interrupt
+ *  - arg:         Argument passed to the interrupt callback
  *
  * Returns:
  *   The previous value of the interrupt handler function pointer.  This
@@ -235,15 +265,15 @@ static int stm32_exti1510_isr(int irq, void *context, void *arg)
  ****************************************************************************/
 
 xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
-                          bool event, xcpt_t func)
+                          bool event, xcpt_t func, void *arg)
 {
+  FAR struct gpio_callback_s *shared_cbs;
   uint32_t pin = pinset & GPIO_PIN_MASK;
   uint32_t exti = STM32_EXTI_BIT(pin);
   int      irq;
   xcpt_t   handler;
   xcpt_t   oldhandler = NULL;
   int      nshared;
-  xcpt_t  *shared_cbs;
   int      i;
 
   /* Select the interrupt handler for this EXTI pin */
@@ -252,7 +282,7 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
     {
       irq        = pin + STM32_IRQ_EXTI0;
       nshared    = 1;
-      shared_cbs = &stm32_exti_callbacks[pin];
+      shared_cbs = &g_gpio_callbacks[pin];
       switch (pin)
         {
           case 0:
@@ -280,21 +310,22 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
     {
       irq        = STM32_IRQ_EXTI95;
       handler    = stm32_exti95_isr;
-      shared_cbs = &stm32_exti_callbacks[5];
+      shared_cbs = &g_gpio_callbacks[5];
       nshared    = 5;
     }
   else
     {
       irq        = STM32_IRQ_EXTI1510;
       handler    = stm32_exti1510_isr;
-      shared_cbs = &stm32_exti_callbacks[10];
+      shared_cbs = &g_gpio_callbacks[10];
       nshared    = 6;
     }
 
   /* Get the previous GPIO IRQ handler; Save the new IRQ handler. */
 
-  oldhandler = stm32_exti_callbacks[pin];
-  stm32_exti_callbacks[pin] = func;
+  oldhandler                     = g_gpio_callbacks[pin].callback;
+  g_gpio_callbacks[pin].callback = func;
+  g_gpio_callbacks[pin].arg      = arg;
 
   /* Install external interrupt handlers */
 
@@ -311,7 +342,7 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
 
       for (i = 0; i < nshared; i++)
         {
-          if (shared_cbs[i] != NULL)
+          if (shared_cbs[i].handler != NULL)
             {
               break;
             }
diff --git a/arch/arm/src/stm32/stm32_exti_pwr.c b/arch/arm/src/stm32/stm32_exti_pwr.c
index 8da33e2c43c..9e3429f98fc 100644
--- a/arch/arm/src/stm32/stm32_exti_pwr.c
+++ b/arch/arm/src/stm32/stm32_exti_pwr.c
@@ -65,11 +65,8 @@
 
 /* Interrupt handlers attached to the PVD EXTI */
 
-static xcpt_t stm32_exti_pvd_callback;
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
+static xcpt_t g_pvd_callback;
+static void  *g_callback_arg;
 
 /****************************************************************************
  * Private Functions
@@ -93,9 +90,9 @@ static int stm32_exti_pvd_isr(int irq, void *context, FAR void *arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32_exti_pvd_callback)
+  if (g_pvd_callback != NULL)
     {
-      ret = stm32_exti_pvd_callback(irq, context, arg);
+      ret = g_pvd_callback(irq, context, g_callback_arg);
     }
 
   return ret;
@@ -115,6 +112,7 @@ static int stm32_exti_pvd_isr(int irq, void *context, FAR void *arg)
  *  - rising/falling edge: enables interrupt on rising/falling edge
  *  - event:  generate event when set
  *  - func:   when non-NULL, generate interrupt
+ *  - arg:    Argument passed to the interrupt callback
  *
  * Returns:
  *   The previous value of the interrupt handler function pointer.  This
@@ -130,8 +128,9 @@ xcpt_t stm32_exti_pvd(bool risingedge, bool fallingedge, bool event,
 
   /* Get the previous GPIO IRQ handler; Save the new IRQ handler. */
 
-  oldhandler = stm32_exti_pvd_callback;
-  stm32_exti_pvd_callback = func;
+  oldhandler     = g_pvd_callback;
+  g_pvd_callback = func;
+  g_callback_arg = arg;
 
   /* Install external interrupt handlers (if not already attached) */
 
diff --git a/arch/arm/src/stm32/stm32_exti_pwr.h b/arch/arm/src/stm32/stm32_exti_pwr.h
index 4955045a2f1..26be9bb0ef6 100644
--- a/arch/arm/src/stm32/stm32_exti_pwr.h
+++ b/arch/arm/src/stm32/stm32_exti_pwr.h
@@ -57,6 +57,7 @@
  *  - rising/falling edge: enables interrupt on rising/falling edge
  *  - event:  generate event when set
  *  - func:   when non-NULL, generate interrupt
+ *  - arg:    Argument passed to the interrupt callback
  *
  * Returns:
  *   The previous value of the interrupt handler function pointer.  This
@@ -66,6 +67,6 @@
  ****************************************************************************/
 
 xcpt_t stm32_exti_pvd(bool risingedge, bool fallingedge, bool event,
-                      xcpt_t func);
+                      xcpt_t func, void *arg);
 
 #endif /* STM32_EXTI_PWR_H_ */
diff --git a/arch/arm/src/stm32f7/stm32_exti.h b/arch/arm/src/stm32f7/stm32_exti.h
index 38ed8a1d6ed..1d32f0fd21b 100644
--- a/arch/arm/src/stm32f7/stm32_exti.h
+++ b/arch/arm/src/stm32f7/stm32_exti.h
@@ -78,6 +78,7 @@ extern "C"
  *  - fallingedge: Enables interrupt on falling edges
  *  - event:       Generate event when set
  *  - func:        When non-NULL, generate interrupt
+ *  - arg:          Argument passed to the interrupt callback
  *
  * Returns:
  *   The previous value of the interrupt handler function pointer.  This
@@ -87,7 +88,7 @@ extern "C"
  ****************************************************************************/
 
 xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
-                          bool event, xcpt_t func);
+                          bool event, xcpt_t func, void *arg);
 
 /****************************************************************************
  * Name: stm32_exti_alarm
@@ -100,6 +101,7 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
  *  - fallingedge: Enables interrupt on falling edges
  *  - event:       Generate event when set
  *  - func:        When non-NULL, generate interrupt
+ *  - arg:         Argument passed to the interrupt callback
  *
  * Returns:
  *   The previous value of the interrupt handler function pointer.  This
@@ -109,7 +111,8 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
  ****************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
-xcpt_t stm32_exti_alarm(bool risingedge, bool fallingedge, bool event, xcpt_t func);
+xcpt_t stm32_exti_alarm(bool risingedge, bool fallingedge, bool event,
+                        xcpt_t func, void *arg);
 #endif
 
 #undef EXTERN
diff --git a/arch/arm/src/stm32f7/stm32_exti_alarm.c b/arch/arm/src/stm32f7/stm32_exti_alarm.c
index 3ad112d7a44..363166cfec0 100644
--- a/arch/arm/src/stm32f7/stm32_exti_alarm.c
+++ b/arch/arm/src/stm32f7/stm32_exti_alarm.c
@@ -67,7 +67,8 @@
 
 /* Interrupt handlers attached to the ALARM EXTI */
 
-static xcpt_t stm32_exti_callback;
+static xcpt_t g_alarm_callback;
+static void  *g_callback_arg;
 
 /****************************************************************************
  * Public Data
@@ -95,9 +96,9 @@ static int stm32_exti_alarm_isr(int irq, void *context, FAR void *arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32_exti_callback)
+  if (g_alarm_callback != NULL)
     {
-      ret = stm32_exti_callback(irq, context);
+      ret = g_alarm_callback(irq, context, g_callback_arg);
     }
 
   return ret;
@@ -117,6 +118,7 @@ static int stm32_exti_alarm_isr(int irq, void *context, FAR void *arg)
  *  - rising/falling edge: enables interrupt on rising/falling edget
  *  - event:  generate event when set
  *  - func:   when non-NULL, generate interrupt
+ *  - arg:    Argument passed to the interrupt callback
  *
  * Returns:
  *   The previous value of the interrupt handler function pointer.  This
@@ -126,14 +128,15 @@ static int stm32_exti_alarm_isr(int irq, void *context, FAR void *arg)
  ****************************************************************************/
 
 xcpt_t stm32_exti_alarm(bool risingedge, bool fallingedge, bool event,
-                        xcpt_t func)
+                        xcpt_t func, void *arg)
 {
   xcpt_t oldhandler;
 
   /* Get the previous GPIO IRQ handler; Save the new IRQ handler. */
 
-  oldhandler          = stm32_exti_callback;
-  stm32_exti_callback = func;
+  oldhandler       = g_alarm_callback;
+  g_alarm_callback = func;
+  g_callback_arg   = arg;
 
   /* Install external interrupt handlers (if not already attached) */
 
diff --git a/arch/arm/src/stm32f7/stm32_exti_gpio.c b/arch/arm/src/stm32f7/stm32_exti_gpio.c
index 283ec89286d..6bee1834a46 100644
--- a/arch/arm/src/stm32f7/stm32_exti_gpio.c
+++ b/arch/arm/src/stm32f7/stm32_exti_gpio.c
@@ -68,13 +68,23 @@
 #if defined(CONFIG_STM32F7_STM32F74XX) || defined(CONFIG_STM32F7_STM32F75XX) \
   || defined(CONFIG_STM32F7_STM32F76XX) || defined(CONFIG_STM32F7_STM32F77XX)
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct gpio_callback_s
+{
+  xcptr_t callback;
+  void   *arg;
+};
+
 /****************************************************************************
  * Private Data
  ****************************************************************************/
 
 /* Interrupt handlers attached to each EXTI */
 
-static xcpt_t stm32_exti_callbacks[16];
+static struct gpio_callback_s g_gpio_callbacks[16];
 
 /****************************************************************************
  * Private Functions
@@ -94,9 +104,12 @@ static int stm32_exti0_isr(int irq, void *context)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32_exti_callbacks[0])
+  if (g_gpio_callbacks[0].callback != NULL)
     {
-      ret = stm32_exti_callbacks[0](irq, context);
+       xcptr_t callback = g_gpio_callbacks[0].callback;
+       void   *arg      = g_gpio_callbacks[0].arg;
+
+      ret = callback(irq, context, arg);
     }
 
   return ret;
@@ -112,9 +125,12 @@ static int stm32_exti1_isr(int irq, void *context)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32_exti_callbacks[1])
+  if (g_gpio_callbacks[1].callback != NULL)
     {
-      ret = stm32_exti_callbacks[1](irq, context);
+       xcptr_t callback = g_gpio_callbacks[1].callback;
+       void   *arg      = g_gpio_callbacks[1].arg;
+
+      ret = callback(irq, context, arg);
     }
 
   return ret;
@@ -130,9 +146,12 @@ static int stm32_exti2_isr(int irq, void *context)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32_exti_callbacks[2])
+  if (g_gpio_callbacks[2].callback != NULL)
     {
-      ret = stm32_exti_callbacks[2](irq, context);
+       xcptr_t callback = g_gpio_callbacks[2].callback;
+       void   *arg      = g_gpio_callbacks[2].arg;
+
+      ret = callback(irq, context, arg);
     }
 
   return ret;
@@ -148,9 +167,12 @@ static int stm32_exti3_isr(int irq, void *context)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32_exti_callbacks[3])
+  if (g_gpio_callbacks[3].callback != NULL)
     {
-      ret = stm32_exti_callbacks[3](irq, context);
+       xcptr_t callback = g_gpio_callbacks[3].callback;
+       void   *arg      = g_gpio_callbacks[3].arg;
+
+      ret = callback(irq, context, arg);
     }
 
   return ret;
@@ -166,9 +188,12 @@ static int stm32_exti4_isr(int irq, void *context)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32_exti_callbacks[4])
+  if (g_gpio_callbacks[4].callback != NULL)
     {
-      ret = stm32_exti_callbacks[4](irq, context);
+       xcptr_t callback = g_gpio_callbacks[4].callback;
+       void   *arg      = g_gpio_callbacks[4].arg;
+
+      ret = callback(irq, context, arg);
     }
 
   return ret;
@@ -199,10 +224,14 @@ static int stm32_exti_multiisr(int irq, void *context, int first, int last)
 
           /* And dispatch the interrupt to the handler */
 
-          if (stm32_exti_callbacks[pin])
+          if (g_gpio_callbacks[pin].callback != NULL)
             {
-              int tmp = stm32_exti_callbacks[pin](irq, context);
-              if (tmp != OK)
+              xcptr_t callback = g_gpio_callbacks[pin].callback;
+              void   *arg      = g_gpio_callbacks[pin].arg;
+              int tmp;
+
+              tmp = callback(irq, context, arg);
+              if (tmp < 0)
                 {
                   ret = tmp;
                 }
@@ -250,13 +279,13 @@ static int stm32_exti1510_isr(int irq, void *context)
 xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
                           bool event, xcpt_t func)
 {
+  struct gpio_callback_s *shared_cbs;
   uint32_t pin = pinset & GPIO_PIN_MASK;
   uint32_t exti = STM32_EXTI_BIT(pin);
   int      irq;
   xcpt_t   handler;
   xcpt_t   oldhandler = NULL;
   int      nshared;
-  xcpt_t  *shared_cbs;
   int      i;
 
   /* Select the interrupt handler for this EXTI pin */
@@ -265,7 +294,7 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
     {
       irq        = pin + STM32_IRQ_EXTI0;
       nshared    = 1;
-      shared_cbs = &stm32_exti_callbacks[pin];
+      shared_cbs = &g_gpio_callbacks[pin];
       switch (pin)
         {
           case 0:
@@ -293,21 +322,22 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
     {
       irq        = STM32_IRQ_EXTI95;
       handler    = stm32_exti95_isr;
-      shared_cbs = &stm32_exti_callbacks[5];
+      shared_cbs = &g_gpio_callbacks[5];
       nshared    = 5;
     }
   else
     {
       irq        = STM32_IRQ_EXTI1510;
       handler    = stm32_exti1510_isr;
-      shared_cbs = &stm32_exti_callbacks[10];
+      shared_cbs = &g_gpio_callbacks[10];
       nshared    = 6;
     }
 
   /* Get the previous GPIO IRQ handler; Save the new IRQ handler. */
 
-  oldhandler = stm32_exti_callbacks[pin];
-  stm32_exti_callbacks[pin] = func;
+  oldhandler                     = g_gpio_callbacks[pin].callback;
+  g_gpio_callbacks[pin].callback = func;
+  g_gpio_callbacks[pin].arg      = arg;
 
   /* Install external interrupt handlers */
 
@@ -324,7 +354,7 @@ xcpt_t stm32_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
 
       for (i = 0; i < nshared; i++)
         {
-          if (shared_cbs[i] != NULL)
+          if (shared_cbs[i].handler != NULL)
             {
               break;
             }
diff --git a/arch/arm/src/stm32f7/stm32_exti_pwr.c b/arch/arm/src/stm32f7/stm32_exti_pwr.c
index 5b6419fba0f..0dafb120ba2 100644
--- a/arch/arm/src/stm32f7/stm32_exti_pwr.c
+++ b/arch/arm/src/stm32f7/stm32_exti_pwr.c
@@ -70,7 +70,8 @@
 
 /* Interrupt handlers attached to the PVD EXTI */
 
-static xcpt_t stm32_exti_pvd_callback;
+static xcpt_t g_pvd_callback;
+static void  *g_callback_arg;
 
 /****************************************************************************
  * Public Data
@@ -98,9 +99,9 @@ static int stm32_exti_pvd_isr(int irq, void *context, FAR void *arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32_exti_pvd_callback)
+  if (g_pvd_callback)
     {
-      ret = stm32_exti_pvd_callback(irq, context);
+      ret = g_pvd_callback(irq, context, g_callback_arg);
     }
 
   return ret;
@@ -135,8 +136,9 @@ xcpt_t stm32_exti_pvd(bool risingedge, bool fallingedge, bool event,
 
   /* Get the previous GPIO IRQ handler; Save the new IRQ handler. */
 
-  oldhandler = stm32_exti_pvd_callback;
-  stm32_exti_pvd_callback = func;
+  oldhandler     = g_pvd_callback;
+  g_pvd_callback = func;
+  g_callback_arg = arg;
 
   /* Install external interrupt handlers (if not already attached) */
 
diff --git a/arch/arm/src/stm32f7/stm32_exti_pwr.h b/arch/arm/src/stm32f7/stm32_exti_pwr.h
index b72acd5cc9f..521e7a7b2a7 100644
--- a/arch/arm/src/stm32f7/stm32_exti_pwr.h
+++ b/arch/arm/src/stm32f7/stm32_exti_pwr.h
@@ -58,6 +58,7 @@
  *  - rising/falling edge: enables interrupt on rising/falling edge
  *  - event:  generate event when set
  *  - func:   when non-NULL, generate interrupt
+ *  - arg:    Argument passed to the interrupt callback
  *
  * Returns:
  *   The previous value of the interrupt handler function pointer.  This
@@ -67,6 +68,6 @@
  ****************************************************************************/
 
 xcpt_t stm32_exti_pvd(bool risingedge, bool fallingedge, bool event,
-                      xcpt_t func);
+                      xcpt_t func, void *arg);
 
 #endif /* __ARCH_ARM_SRC_STM32F7_STM32_EXTI_PWR_H */
diff --git a/arch/arm/src/stm32l4/stm32l4_exti.h b/arch/arm/src/stm32l4/stm32l4_exti.h
index 36c7fffdd96..0e0a63cf6f0 100644
--- a/arch/arm/src/stm32l4/stm32l4_exti.h
+++ b/arch/arm/src/stm32l4/stm32l4_exti.h
@@ -77,6 +77,7 @@ extern "C"
  *  - rising/falling edge: enables
  *  - event:  generate event when set
  *  - func:   when non-NULL, generate interrupt
+ *  - arg:    Argument passed to the interrupt callback
  *
  * Returns:
  *  The previous value of the interrupt handler function pointer.  This value may,
@@ -86,9 +87,9 @@ extern "C"
  ************************************************************************************/
 
 xcpt_t stm32l4_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
-                          bool event, xcpt_t func);
+                          bool event, xcpt_t func, void *arg);
 
-/************************************************************************************
+/****************************************************************************
  * Name: stm32l4_exti_alarm
  *
  * Description:
@@ -98,16 +99,18 @@ xcpt_t stm32l4_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
  *  - rising/falling edge: enables interrupt on rising/falling edges
  *  - event:  generate event when set
  *  - func:   when non-NULL, generate interrupt
+ *  - arg:    Argument passed to the interrupt callback
  *
  * Returns:
- *   The previous value of the interrupt handler function pointer.  This value may,
- *   for example, be used to restore the previous handler when multiple handlers are
- *   used.
+ *   The previous value of the interrupt handler function pointer.  This
+ *   value may, for example, be used to restore the previous handler when
+ *   multiple handlers are used.
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifdef CONFIG_RTC_ALARM
-xcpt_t stm32l4_exti_alarm(bool risingedge, bool fallingedge, bool event, xcpt_t func);
+xcpt_t stm32l4_exti_alarm(bool risingedge, bool fallingedge, bool event,
+                          xcpt_t func, void *arg);
 #endif
 
 /****************************************************************************
@@ -121,6 +124,7 @@ xcpt_t stm32l4_exti_alarm(bool risingedge, bool fallingedge, bool event, xcpt_t
  *  - rising/falling edge: enables interrupt on rising/falling edget
  *  - event:  generate event when set
  *  - func:   when non-NULL, generate interrupt
+ *  - arg:    Argument passed to the interrupt callback
  *
  * Returns:
  *   The previous value of the interrupt handler function pointer.  This
@@ -131,7 +135,7 @@ xcpt_t stm32l4_exti_alarm(bool risingedge, bool fallingedge, bool event, xcpt_t
 
 #ifdef CONFIG_STM32L4_COMP
 xcpt_t stm32l4_exti_comp(int cmp, bool risingedge, bool fallingedge,
-                         bool event, xcpt_t func);
+                         bool event, xcpt_t func, void *arg);
 #endif
 
 #undef EXTERN
diff --git a/arch/arm/src/stm32l4/stm32l4_exti_alarm.c b/arch/arm/src/stm32l4/stm32l4_exti_alarm.c
index 5aec102d178..2cfcbe052e0 100644
--- a/arch/arm/src/stm32l4/stm32l4_exti_alarm.c
+++ b/arch/arm/src/stm32l4/stm32l4_exti_alarm.c
@@ -60,7 +60,8 @@
 
 /* Interrupt handlers attached to the ALARM EXTI */
 
-static xcpt_t stm32l4_exti_callback;
+static xcpt_t g_alarm_callback;
+static void  *g_callback_arg;
 
 /****************************************************************************
  * Private Functions
@@ -80,9 +81,9 @@ static int stm32l4_exti_alarm_isr(int irq, void *context, FAR void *arg)
 
   /* Dispatch the interrupt to the handler */
 
-  if (stm32l4_exti_callback)
+  if (g_alarm_callback != NULL)
     {
-      ret = stm32l4_exti_callback(irq, context, arg);
+      ret = g_alarm_callback(irq, context, g_callback_arg);
     }
 
   /* Clear the pending EXTI interrupt */
@@ -115,14 +116,15 @@ static int stm32l4_exti_alarm_isr(int irq, void *context, FAR void *arg)
  ****************************************************************************/
 
 xcpt_t stm32l4_exti_alarm(bool risingedge, bool fallingedge, bool event,
-                        xcpt_t func)
+                          xcpt_t func, void *arg)
 {
   xcpt_t oldhandler;
 
   /* Get the previous GPIO IRQ handler; Save the new IRQ handler. */
 
-  oldhandler          = stm32l4_exti_callback;
-  stm32l4_exti_callback = func;
+  oldhandler       = g_alarm_callback;
+  g_alarm_callback = func;
+  g__callback_arg  = arg;
 
   /* Install external interrupt handlers (if not already attached) */
 
diff --git a/arch/arm/src/stm32l4/stm32l4_exti_comp.c b/arch/arm/src/stm32l4/stm32l4_exti_comp.c
index 4eaa412603d..bb25e5b0962 100644
--- a/arch/arm/src/stm32l4/stm32l4_exti_comp.c
+++ b/arch/arm/src/stm32l4/stm32l4_exti_comp.c
@@ -47,17 +47,27 @@
 #include "stm32l4_exti.h"
 #include "chip/stm32l4_exti.h"
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct comp_callback_s
+{
+  xcptr_t callback;
+  void   *arg;
+};
+
 /****************************************************************************
  * Private Data
  ****************************************************************************/
 
 /* Interrupt handlers attached to the COMP EXTI lines */
 
-static xcpt_t stm32l4_exti_comp_handlers[STM32L4_COMP_NUM];
+static struct comp_callback_s g_comp_handlers[STM32L4_COMP_NUM];
 
 /* Comparator EXTI lines */
 
-static const uint32_t stm32l4_exti_comp_lines[STM32L4_COMP_NUM] =
+static const uint32_t g_comp_lines[STM32L4_COMP_NUM] =
 {
 #if defined(CONFIG_STM32L4_STM32L4X3) || defined (CONFIG_STM32L4_STM32L4X6)
   EXTI1_COMP1,
@@ -83,15 +93,17 @@ static int stm32l4_exti_comp_isr(int irq, void *context)
   pr = getreg32(STM32L4_EXTI1_PR);
   for (i = 0; i < STM32L4_COMP_NUM; i++)
     {
-      ln = stm32l4_exti_comp_lines[i];
+      ln = g_comp_lines[i];
       if ((pr & ln) != 0)
         {
           /* Clear the pending interrupt */
 
           putreg32(ln, STM32L4_EXTI1_PR);
-          if (stm32l4_exti_comp_handlers[i])
+          if (g_comp_handlers[i].callback != NULL)
             {
-              ret = stm32l4_exti_comp_handlers[i](irq, context);
+              xcpt_t callback = g_comp_handlers[i].callback;
+              vid   *arg      = g_comp_handlers[i].arg;
+              ret = callback(irq, context, arg);
             }
         }
     }
@@ -114,6 +126,7 @@ static int stm32l4_exti_comp_isr(int irq, void *context)
  *  - rising/falling edge: enables interrupt on rising/falling edget
  *  - event:  generate event when set
  *  - func:   when non-NULL, generate interrupt
+ *  - arg:    Argument passed to the interrupt callback
  *
  * Returns:
  *   The previous value of the interrupt handler function pointer.  This
@@ -123,11 +136,11 @@ static int stm32l4_exti_comp_isr(int irq, void *context)
  ****************************************************************************/
 
 xcpt_t stm32l4_exti_comp(int cmp, bool risingedge, bool fallingedge,
-                         bool event, xcpt_t func)
+                         bool event, xcpt_t func, void *arg)
 {
   xcpt_t oldhandler;
   irqstate_t flags;
-  uint32_t ln = stm32l4_exti_comp_lines[cmp];
+  uint32_t ln = g_comp_lines[cmp];
 
  /* Perform the following within a critical section so that the handler gets
   * installed correctly before the next interrupt is received.
@@ -159,8 +172,9 @@ xcpt_t stm32l4_exti_comp(int cmp, bool risingedge, bool fallingedge,
 
     /* Get the previous IRQ handler and save the new IRQ handler. */
 
-    oldhandler = stm32l4_exti_comp_handlers[cmp];
-    stm32l4_exti_comp_handlers[cmp] = func;
+    oldhandler                    = g_comp_handlers[cmp].callback;
+    g_comp_handlers[cmp].callback = func;
+    g_comp_handlers[cmp].arg      = arg;
 
     /* Leave the critical section */
 
diff --git a/arch/arm/src/stm32l4/stm32l4_exti_gpio.c b/arch/arm/src/stm32l4/stm32l4_exti_gpio.c
index 985d6588c4b..298237fbfd5 100644
--- a/arch/arm/src/stm32l4/stm32l4_exti_gpio.c
+++ b/arch/arm/src/stm32l4/stm32l4_exti_gpio.c
@@ -55,13 +55,23 @@
 #include "stm32l4_gpio.h"
 #include "stm32l4_exti.h"
 
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct gpio_callback_s
+{
+  xcptr_t callback;
+  void   *arg;
+};
+
 /****************************************************************************
  * Private Data
  ****************************************************************************/
 
 /* Interrupt handlers attached to each EXTI */
 
-static xcpt_t stm32l4_exti_callbacks[16];
+static struct gpio_callback_s g_gpio_handlers[16];
 
 /****************************************************************************
  * Private Functions
@@ -81,9 +91,12 @@ static int stm32l4_exti0_isr(int irq, void *context, FAR void *arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32l4_exti_callbacks[0])
+  if (g_gpio_handlers[0].callback != NULL)
     {
-      ret = stm32l4_exti_callbacks[0](irq, context, arg);
+      xcpt_t callback = g_gpio_handlers[0].callback;
+      void  *cbarg    = g_gpio_handlers[0].arg;
+
+      ret = callback(irq, context, cbarg);
     }
 
   return ret;
@@ -99,9 +112,12 @@ static int stm32l4_exti1_isr(int irq, void *context, FAR void *arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32l4_exti_callbacks[1])
+  if (g_gpio_handlers[1].callback != NULL)
     {
-      ret = stm32l4_exti_callbacks[1](irq, context, arg);
+      xcpt_t callback = g_gpio_handlers[1].callback;
+      void  *cbarg    = g_gpio_handlers[1].arg;
+
+      ret = callback(irq, context, cbarg);
     }
 
   return ret;
@@ -117,9 +133,12 @@ static int stm32l4_exti2_isr(int irq, void *context, FAR void *arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32l4_exti_callbacks[2])
+  if (g_gpio_handlers[2].callback != NULL)
     {
-      ret = stm32l4_exti_callbacks[2](irq, context, arg);
+      xcpt_t callback = g_gpio_handlers[2].callback;
+      void  *cbarg    = g_gpio_handlers[2].arg;
+
+      ret = callback(irq, context, cbarg);
     }
 
   return ret;
@@ -135,9 +154,12 @@ static int stm32l4_exti3_isr(int irq, void *context, FAR void *arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32l4_exti_callbacks[3])
+  if (g_gpio_handlers[3].callback != NULL)
     {
-      ret = stm32l4_exti_callbacks[3](irq, context, arg);
+      xcpt_t callback = g_gpio_handlers[3].callback;
+      void  *cbarg    = g_gpio_handlers[3].arg;
+
+      ret = callback(irq, context, cbarg);
     }
 
   return ret;
@@ -153,9 +175,12 @@ static int stm32l4_exti4_isr(int irq, void *context, FAR void *arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32l4_exti_callbacks[4])
+  if (g_gpio_handlers[4].callback != NULL)
     {
-      ret = stm32l4_exti_callbacks[4](irq, context, arg);
+      xcpt_t callback = g_gpio_handlers[4].callback;
+      void  *cbarg    = g_gpio_handlers[4].arg;
+
+      ret = callback(irq, context, cbarg);
     }
 
   return ret;
@@ -186,10 +211,14 @@ static int stm32l4_exti_multiisr(int irq, void *context, void *arg, int first, i
 
           /* And dispatch the interrupt to the handler */
 
-          if (stm32l4_exti_callbacks[pin])
+          if (g_gpio_handlers[pin].callback != NULL)
             {
-              int tmp = stm32l4_exti_callbacks[pin](irq, context, arg);
-              if (tmp != OK)
+              xcpt_t callback = g_gpio_handlers[pin].callback;
+              void  *cbarg    = g_gpio_handlers[pin].arg;
+              int tmp;
+
+              tmp = callback(irq, context, cbarg);
+              if (tmp < 0)
                 {
                   ret = tmp;
                 }
@@ -226,6 +255,7 @@ static int stm32l4_exti1510_isr(int irq, void *context, FAR void *arg)
  *  - fallingedge: Enables interrupt on falling edges
  *  - event:       Generate event when set
  *  - func:        When non-NULL, generate interrupt
+ *  - arg:         Argument passed to the interrupt callback
  *
  * Returns:
  *   The previous value of the interrupt handler function pointer.  This
@@ -235,15 +265,15 @@ static int stm32l4_exti1510_isr(int irq, void *context, FAR void *arg)
  ****************************************************************************/
 
 xcpt_t stm32l4_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
-                          bool event, xcpt_t func)
+                          bool event, xcpt_t func, void *arg)
 {
+  struct gpio_callback_s *shared_cbs;
   uint32_t pin = pinset & GPIO_PIN_MASK;
   uint32_t exti = STM32L4_EXTI1_BIT(pin);
   int      irq;
   xcpt_t   handler;
   xcpt_t   oldhandler = NULL;
   int      nshared;
-  xcpt_t  *shared_cbs;
   int      i;
 
   /* Select the interrupt handler for this EXTI pin */
@@ -252,7 +282,7 @@ xcpt_t stm32l4_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
     {
       irq        = pin + STM32L4_IRQ_EXTI0;
       nshared    = 1;
-      shared_cbs = &stm32l4_exti_callbacks[pin];
+      shared_cbs = &g_gpio_handlers[pin];
       switch (pin)
         {
           case 0:
@@ -280,21 +310,22 @@ xcpt_t stm32l4_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
     {
       irq        = STM32L4_IRQ_EXTI95;
       handler    = stm32l4_exti95_isr;
-      shared_cbs = &stm32l4_exti_callbacks[5];
+      shared_cbs = &g_gpio_handlers[5];
       nshared    = 5;
     }
   else
     {
       irq        = STM32L4_IRQ_EXTI1510;
       handler    = stm32l4_exti1510_isr;
-      shared_cbs = &stm32l4_exti_callbacks[10];
+      shared_cbs = &g_gpio_handlers[10];
       nshared    = 6;
     }
 
   /* Get the previous GPIO IRQ handler; Save the new IRQ handler. */
 
-  oldhandler = stm32l4_exti_callbacks[pin];
-  stm32l4_exti_callbacks[pin] = func;
+  oldhandler                    = g_gpio_handlers[pin].callback;
+  g_gpio_handlers[pin].callback = func;
+  g_gpio_handlers[pin].arg      = arg;
 
   /* Install external interrupt handlers */
 
@@ -311,7 +342,7 @@ xcpt_t stm32l4_gpiosetevent(uint32_t pinset, bool risingedge, bool fallingedge,
 
       for (i = 0; i < nshared; i++)
         {
-          if (shared_cbs[i] != NULL)
+          if (shared_cbs[i].callback != NULL)
             {
               break;
             }
diff --git a/arch/arm/src/stm32l4/stm32l4_exti_pwr.c b/arch/arm/src/stm32l4/stm32l4_exti_pwr.c
index 535183316e3..4f8541817d1 100644
--- a/arch/arm/src/stm32l4/stm32l4_exti_pwr.c
+++ b/arch/arm/src/stm32l4/stm32l4_exti_pwr.c
@@ -65,7 +65,8 @@
 
 /* Interrupt handlers attached to the PVD EXTI */
 
-static xcpt_t stm32l4_exti_pvd_callback;
+static xcpt_t g_pvd_callback;
+static void  *g_callback_arg
 
 /****************************************************************************
  * Public Data
@@ -93,9 +94,9 @@ static int stm32l4_exti_pvd_isr(int irq, void *context, FAR void *arg)
 
   /* And dispatch the interrupt to the handler */
 
-  if (stm32l4_exti_pvd_callback)
+  if (g_pvd_callback != NULL)
     {
-      ret = stm32l4_exti_pvd_callback(irq, context, arg);
+      ret = g_pvd_callback(irq, context, g_callback_arg);
     }
 
   return ret;
@@ -124,14 +125,15 @@ static int stm32l4_exti_pvd_isr(int irq, void *context, FAR void *arg)
  ****************************************************************************/
 
 xcpt_t stm32l4_exti_pvd(bool risingedge, bool fallingedge, bool event,
-                      xcpt_t func)
+                        xcpt_t func, void *arg)
 {
   xcpt_t oldhandler;
 
   /* Get the previous GPIO IRQ handler; Save the new IRQ handler. */
 
-  oldhandler = stm32l4_exti_pvd_callback;
-  stm32l4_exti_pvd_callback = func;
+  oldhandler     = g_pvd_callback;
+  g_pvd_callback = func;
+  g_callback_arg = arg;
 
   /* Install external interrupt handlers (if not already attached) */
 
diff --git a/configs/avr32dev1/src/avr32_buttons.c b/configs/avr32dev1/src/avr32_buttons.c
index 49a227d8a10..228a43098a9 100644
--- a/configs/avr32dev1/src/avr32_buttons.c
+++ b/configs/avr32dev1/src/avr32_buttons.c
@@ -55,14 +55,6 @@
 
 #ifdef CONFIG_ARCH_BUTTONS
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -77,7 +69,7 @@
 
 #if defined(CONFIG_AVR32_GPIOIRQ) && defined(CONFIG_ARCH_IRQBUTTONS) && \
    (defined(CONFIG_AVR32DEV_BUTTON1_IRQ) || defined(CONFIG_AVR32DEV_BUTTON2_IRQ))
-static xcpt_t board_button_irqx(int irq, xcpt_t irqhandler)
+static xcpt_t board_button_irqx(int irq, xcpt_t irqhandler, void *arg)
 {
   xcpt_t oldhandler;
 
@@ -164,19 +156,19 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_AVR32_GPIOIRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
 #ifdef CONFIG_AVR32DEV_BUTTON1_IRQ
   if (id == BUTTON1)
     {
-      return board_button_irqx(GPIO_BUTTON1_IRQ, irqhandler);
+      return board_button_irqx(GPIO_BUTTON1_IRQ, irqhandler, arg);
     }
   else
 #endif
 #ifdef CONFIG_AVR32DEV_BUTTON2_IRQ
   if (id == BUTTON2)
     {
-      return board_button_irqx(GPIO_BUTTON2_IRQ, irqhandler);
+      return board_button_irqx(GPIO_BUTTON2_IRQ, irqhandler, arg);
     }
   else
 #endif
diff --git a/configs/bambino-200e/src/lpc43_buttons.c b/configs/bambino-200e/src/lpc43_buttons.c
index b84a0744399..dbaf33d1b53 100644
--- a/configs/bambino-200e/src/lpc43_buttons.c
+++ b/configs/bambino-200e/src/lpc43_buttons.c
@@ -172,7 +172,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_LPC43_GPIO_IRQ)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
   irqstate_t flags;
diff --git a/configs/cloudctrl/src/stm32_buttons.c b/configs/cloudctrl/src/stm32_buttons.c
index 43a090b05b2..5766e8ca331 100644
--- a/configs/cloudctrl/src/stm32_buttons.c
+++ b/configs/cloudctrl/src/stm32_buttons.c
@@ -159,7 +159,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -167,8 +167,10 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
+                                      irqhandler, arg);
     }
+
   return oldhandler;
 }
 #endif
diff --git a/configs/dk-tm4c129x/src/tm4c_buttons.c b/configs/dk-tm4c129x/src/tm4c_buttons.c
index 3e08a92512e..69b1766a116 100644
--- a/configs/dk-tm4c129x/src/tm4c_buttons.c
+++ b/configs/dk-tm4c129x/src/tm4c_buttons.c
@@ -150,7 +150,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_TIVA_GPIOP_IRQS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   static xcpt_t handler = NULL;
   xcpt_t oldhandler = handler;
diff --git a/configs/fire-stm32v2/src/stm32_buttons.c b/configs/fire-stm32v2/src/stm32_buttons.c
index fe1d35f5165..aac98c1973a 100644
--- a/configs/fire-stm32v2/src/stm32_buttons.c
+++ b/configs/fire-stm32v2/src/stm32_buttons.c
@@ -134,7 +134,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   uint16_t gpio;
 
@@ -151,7 +151,7 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
       return NULL;
     }
 
-  return stm32_gpiosetevent(gpio, true, true, true, irqhandler);
+  return stm32_gpiosetevent(gpio, true, true, true, irqhandler, arg);
 }
 #endif
 #endif /* CONFIG_ARCH_BUTTONS */
diff --git a/configs/fire-stm32v2/src/stm32_enc28j60.c b/configs/fire-stm32v2/src/stm32_enc28j60.c
index cd5ee2c6b31..7ce3f4de651 100644
--- a/configs/fire-stm32v2/src/stm32_enc28j60.c
+++ b/configs/fire-stm32v2/src/stm32_enc28j60.c
@@ -159,7 +159,8 @@ static void up_enable(FAR const struct enc_lower_s *lower)
   FAR struct stm32_lower_s *priv = (FAR struct stm32_lower_s *)lower;
 
   DEBUGASSERT(priv->handler);
-  (void)stm32_gpiosetevent(GPIO_ENC28J60_INTR, false, true, true, priv->handler);
+  (void)stm32_gpiosetevent(GPIO_ENC28J60_INTR, false, true, true,
+                           priv->handler, NULL);
 }
 
 static void up_disable(FAR const struct enc_lower_s *lower)
diff --git a/configs/freedom-k64f/src/k64_buttons.c b/configs/freedom-k64f/src/k64_buttons.c
index f1f4ba88477..659b55497b5 100644
--- a/configs/freedom-k64f/src/k64_buttons.c
+++ b/configs/freedom-k64f/src/k64_buttons.c
@@ -133,7 +133,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler;
   uint32_t pinset;
diff --git a/configs/freedom-k66f/src/k66_buttons.c b/configs/freedom-k66f/src/k66_buttons.c
index c772177d1d8..caa7da5bad7 100644
--- a/configs/freedom-k66f/src/k66_buttons.c
+++ b/configs/freedom-k66f/src/k66_buttons.c
@@ -137,7 +137,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler;
   uint32_t pinset;
diff --git a/configs/hymini-stm32v/src/stm32_appinit.c b/configs/hymini-stm32v/src/stm32_appinit.c
index 843660880a4..2697adcb213 100644
--- a/configs/hymini-stm32v/src/stm32_appinit.c
+++ b/configs/hymini-stm32v/src/stm32_appinit.c
@@ -182,7 +182,7 @@ int board_app_initialize(uintptr_t arg)
 
   /* Register an interrupt handler for the card detect pin */
 
-  stm32_gpiosetevent(GPIO_SD_CD, true, true, true, nsh_cdinterrupt);
+  stm32_gpiosetevent(GPIO_SD_CD, true, true, true, nsh_cdinterrupt, NULL);
 
   /* Mount the SDIO-based MMC/SD block driver */
 
diff --git a/configs/hymini-stm32v/src/stm32_buttons.c b/configs/hymini-stm32v/src/stm32_buttons.c
index a31b38f923a..578b2fa5b43 100644
--- a/configs/hymini-stm32v/src/stm32_buttons.c
+++ b/configs/hymini-stm32v/src/stm32_buttons.c
@@ -128,7 +128,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
   {
     xcpt_t oldhandler = NULL;
     uint32_t pinset = GPIO_BTN_KEYA;
@@ -139,8 +139,10 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
       }
     if (id < 2)
       {
-        oldhandler = stm32_gpiosetevent(pinset, true, true, true, irqhandler);
+        oldhandler = stm32_gpiosetevent(pinset, true, true, true,
+                                        irqhandler, arg);
       }
+
     return oldhandler;
   }
 #endif
diff --git a/configs/hymini-stm32v/src/stm32_ts.c b/configs/hymini-stm32v/src/stm32_ts.c
index 16f91c3fd0e..a4abc234db7 100644
--- a/configs/hymini-stm32v/src/stm32_ts.c
+++ b/configs/hymini-stm32v/src/stm32_ts.c
@@ -98,7 +98,7 @@ static int hymini_ts_irq_attach(FAR struct ads7843e_config_s *state, xcpt_t isr)
   iinfo("hymini_ts_irq_attach\n");
 
   tc_isr = isr;
-  stm32_gpiosetevent(GPIO_TS_IRQ, true, true, true, isr);
+  stm32_gpiosetevent(GPIO_TS_IRQ, true, true, true, isr, NULL);
   return OK;
 }
 
diff --git a/configs/kwikstik-k40/src/k40_buttons.c b/configs/kwikstik-k40/src/k40_buttons.c
index f3bf65d3d14..3fff4a2333f 100644
--- a/configs/kwikstik-k40/src/k40_buttons.c
+++ b/configs/kwikstik-k40/src/k40_buttons.c
@@ -117,7 +117,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   /* The KwikStik-K40 board has no standard GPIO contact buttons */
 
diff --git a/configs/launchxl-tms57004/src/tms570_buttons.c b/configs/launchxl-tms57004/src/tms570_buttons.c
index d59368aacbb..68c8231926c 100644
--- a/configs/launchxl-tms57004/src/tms570_buttons.c
+++ b/configs/launchxl-tms57004/src/tms570_buttons.c
@@ -85,7 +85,7 @@ static xcpt_t g_irq_button;
 
 #ifdef HAVE_IRQBUTTONS
 static xcpt_t board_button_irqx(gio_pinset_t pinset, int irq,
-                                xcpt_t irqhandler, xcpt_t *store)
+                                xcpt_t irqhandler, xcpt_t *store, void *arg)
 {
   xcpt_t oldhandler;
   irqstate_t flags;
@@ -108,7 +108,7 @@ static xcpt_t board_button_irqx(gio_pinset_t pinset, int irq,
       /* Configure the interrupt */
 
       tms570_gioirq(pinset);
-      (void)irq_attach(irq, irqhandler, NULL);
+      (void)irq_attach(irq, irqhandler, arg);
       tms570_gioirqenable(irq);
     }
   else
@@ -183,12 +183,13 @@ uint8_t board_buttons(void)
  *
  ****************************************************************************/
 
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
 #ifdef HAVE_IRQBUTTONS
   if (id == BUTTON_GIOA7)
     {
-      return board_button_irqx(GIO_BUTTON, IRQ_BUTTON, irqhandler, &g_irq_button);
+      return board_button_irqx(GIO_BUTTON, IRQ_BUTTON, irqhandler,i
+                               &g_irq_button, arg);
     }
 #endif
 
diff --git a/configs/lincoln60/src/lpc17_buttons.c b/configs/lincoln60/src/lpc17_buttons.c
index 8b24ff5f3ad..5764415e4e1 100644
--- a/configs/lincoln60/src/lpc17_buttons.c
+++ b/configs/lincoln60/src/lpc17_buttons.c
@@ -179,7 +179,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_LPC17_GPIOIRQ)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
   irqstate_t flags;
diff --git a/configs/lpc4330-xplorer/src/lpc43_buttons.c b/configs/lpc4330-xplorer/src/lpc43_buttons.c
index c74d6dae60e..33431b6f0ab 100644
--- a/configs/lpc4330-xplorer/src/lpc43_buttons.c
+++ b/configs/lpc4330-xplorer/src/lpc43_buttons.c
@@ -178,7 +178,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_LPC43_GPIO_IRQ)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
   irqstate_t flags;
diff --git a/configs/lpc4357-evb/src/lpc43_buttons.c b/configs/lpc4357-evb/src/lpc43_buttons.c
index 410b942c76b..feeab979a06 100644
--- a/configs/lpc4357-evb/src/lpc43_buttons.c
+++ b/configs/lpc4357-evb/src/lpc43_buttons.c
@@ -184,7 +184,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_LPC43_GPIO_IRQ)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
 #if 0 /* Not yet implemented */
   xcpt_t oldhandler = NULL;
diff --git a/configs/mikroe-stm32f4/src/stm32_usb.c b/configs/mikroe-stm32f4/src/stm32_usb.c
index 001d6e0930a..44321bd7d36 100644
--- a/configs/mikroe-stm32f4/src/stm32_usb.c
+++ b/configs/mikroe-stm32f4/src/stm32_usb.c
@@ -282,7 +282,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable)
 #ifdef CONFIG_USBHOST
 xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 {
-  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler);
+  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler, NULL);
 }
 #endif
 
diff --git a/configs/mikroe-stm32f4/src/stm32_vs1053.c b/configs/mikroe-stm32f4/src/stm32_vs1053.c
index 15f35bc839c..182c559fa63 100644
--- a/configs/mikroe-stm32f4/src/stm32_vs1053.c
+++ b/configs/mikroe-stm32f4/src/stm32_vs1053.c
@@ -138,12 +138,13 @@ static void up_enable(FAR const struct vs1053_lower_s *lower)
   FAR struct stm32_lower_s *priv = (FAR struct stm32_lower_s *)lower;
 
   DEBUGASSERT(priv->handler);
-  (void)stm32_gpiosetevent(GPIO_VS1053_DREQ, true, false, false, priv->handler);
+  (void)stm32_gpiosetevent(GPIO_VS1053_DREQ, true, false, false,
+                           priv->handler, priv->arg);
 }
 
 static void up_disable(FAR const struct vs1053_lower_s *lower)
 {
-  (void)stm32_gpiosetevent(GPIO_VS1053_DREQ, false, false, false, NULL);
+  (void)stm32_gpiosetevent(GPIO_VS1053_DREQ, false, false, false, NULL, NULL);
 }
 
 static void up_reset(FAR const struct vs1053_lower_s *lower, bool state)
diff --git a/configs/nucleo-144/src/stm32_buttons.c b/configs/nucleo-144/src/stm32_buttons.c
index ff0e64d7642..7745758cb9d 100644
--- a/configs/nucleo-144/src/stm32_buttons.c
+++ b/configs/nucleo-144/src/stm32_buttons.c
@@ -105,13 +105,14 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
   if (id == BUTTON_USER)
     {
-      oldhandler = stm32_gpiosetevent(GPIO_BTN_USER, true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(GPIO_BTN_USER, true, true, true,
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/nucleo-144/src/stm32_sdio.c b/configs/nucleo-144/src/stm32_sdio.c
index 7904f8c2eba..0a79f9258dc 100644
--- a/configs/nucleo-144/src/stm32_sdio.c
+++ b/configs/nucleo-144/src/stm32_sdio.c
@@ -132,7 +132,8 @@ int stm32_sdio_initialize(void)
 
   /* Register an interrupt handler for the card detect pin */
 
-  stm32_gpiosetevent(GPIO_SDMMC1_NCD, true, true, true, stm32_ncd_interrupt);
+  stm32_gpiosetevent(GPIO_SDMMC1_NCD, true, true, true,
+                     stm32_ncd_interrupt, NULL);
 #endif
 
   /* Mount the SDIO-based MMC/SD block driver */
diff --git a/configs/nucleo-144/src/stm32_usb.c b/configs/nucleo-144/src/stm32_usb.c
index 1cb422a78c4..a1a2059176d 100644
--- a/configs/nucleo-144/src/stm32_usb.c
+++ b/configs/nucleo-144/src/stm32_usb.c
@@ -304,7 +304,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable)
 #ifdef CONFIG_USBHOST
 xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 {
-  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler);
+  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler, NULL);
 }
 #endif
 
diff --git a/configs/nucleo-f303re/src/stm32_buttons.c b/configs/nucleo-f303re/src/stm32_buttons.c
index 82e9c9eff25..f5dcc7224f2 100644
--- a/configs/nucleo-f303re/src/stm32_buttons.c
+++ b/configs/nucleo-f303re/src/stm32_buttons.c
@@ -126,14 +126,14 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
   if (id == BUTTON_USER)
     {
       oldhandler = stm32_gpiosetevent(GPIO_BTN_USER, true, true, true,
-                                      irqhandler);
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/nucleo-f4x1re/src/stm32_ajoystick.c b/configs/nucleo-f4x1re/src/stm32_ajoystick.c
index 5fc611bb020..fc5b5cc237e 100644
--- a/configs/nucleo-f4x1re/src/stm32_ajoystick.c
+++ b/configs/nucleo-f4x1re/src/stm32_ajoystick.c
@@ -377,7 +377,7 @@ static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower,
                       i, rising, falling);
 
                (void)stm32_gpiosetevent(g_joygpio[i], rising, falling,
-                                        true, ajoy_interrupt);
+                                        true, ajoy_interrupt, NULL);
              }
         }
     }
@@ -403,7 +403,7 @@ static void ajoy_disable(void)
   flags = enter_critical_section();
   for (i = 0; i < AJOY_NGPIOS; i++)
     {
-      (void)stm32_gpiosetevent(g_joygpio[i], false, false, false, NULL);
+      (void)stm32_gpiosetevent(g_joygpio[i], false, false, false, NULL, NULL);
     }
 
   leave_critical_section(flags);
diff --git a/configs/nucleo-f4x1re/src/stm32_buttons.c b/configs/nucleo-f4x1re/src/stm32_buttons.c
index 2960344c62e..c93b03d21a9 100644
--- a/configs/nucleo-f4x1re/src/stm32_buttons.c
+++ b/configs/nucleo-f4x1re/src/stm32_buttons.c
@@ -123,13 +123,14 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
   if (id == BUTTON_USER)
     {
-      oldhandler = stm32_gpiosetevent(GPIO_BTN_USER, true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(GPIO_BTN_USER, true, true, true,
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/nucleo-f4x1re/src/stm32_io.c b/configs/nucleo-f4x1re/src/stm32_io.c
index 72563330d6c..ba190495454 100644
--- a/configs/nucleo-f4x1re/src/stm32_io.c
+++ b/configs/nucleo-f4x1re/src/stm32_io.c
@@ -184,11 +184,13 @@ xcpt_t up_irqio(int id, xcpt_t irqhandler)
 
   if (id == 0)
     {
-      oldhandler = stm32_gpiosetevent(GPIO_D14, true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(GPIO_D14, true, true, true,
+                                      irqhandler, arg);
     }
   else if (id == 1)
     {
-      oldhandler = stm32_gpiosetevent(GPIO_D15, true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(GPIO_D15, true, true, true,
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/nucleo-f4x1re/src/stm32_wireless.c b/configs/nucleo-f4x1re/src/stm32_wireless.c
index 32cfd31775f..c5012f04388 100644
--- a/configs/nucleo-f4x1re/src/stm32_wireless.c
+++ b/configs/nucleo-f4x1re/src/stm32_wireless.c
@@ -204,11 +204,13 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable)
   iinfo("enable:%d\n", enable);
   if (enable)
     {
-      (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, true, false, priv->handler);
+      (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, true, false,
+                               priv->handler, priv->arg);
     }
   else
     {
-      (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, false, false, NULL);
+      (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, false, false,
+                               NULL, NULL);
     }
 }
 
diff --git a/configs/nucleo-l476rg/src/stm32_ajoystick.c b/configs/nucleo-l476rg/src/stm32_ajoystick.c
index b524d82279c..3c20ebca2ec 100644
--- a/configs/nucleo-l476rg/src/stm32_ajoystick.c
+++ b/configs/nucleo-l476rg/src/stm32_ajoystick.c
@@ -376,7 +376,7 @@ static void ajoy_enable(FAR const struct ajoy_lowerhalf_s *lower,
                       i, rising, falling);
 
                (void)stm32_gpiosetevent(g_joygpio[i], rising, falling,
-                                        true, ajoy_interrupt);
+                                        true, ajoy_interrupt, NULL);
              }
         }
     }
@@ -402,7 +402,7 @@ static void ajoy_disable(void)
   flags = up_irq_save();
   for (i = 0; i < AJOY_NGPIOS; i++)
     {
-      (void)stm32_gpiosetevent(g_joygpio[i], false, false, false, NULL);
+      (void)stm32_gpiosetevent(g_joygpio[i], false, false, false, NULL, NULL);
     }
 
   up_irq_restore(flags);
diff --git a/configs/nucleo-l476rg/src/stm32_buttons.c b/configs/nucleo-l476rg/src/stm32_buttons.c
index f9211a13c7d..63a96d7a92c 100644
--- a/configs/nucleo-l476rg/src/stm32_buttons.c
+++ b/configs/nucleo-l476rg/src/stm32_buttons.c
@@ -123,13 +123,14 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
   if (id == BUTTON_USER)
     {
-      oldhandler = stm32_gpiosetevent(GPIO_BTN_USER, true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(GPIO_BTN_USER, true, true, true,
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/nucleo-l476rg/src/stm32_io.c b/configs/nucleo-l476rg/src/stm32_io.c
index d98f2985bf2..d6468c5d053 100644
--- a/configs/nucleo-l476rg/src/stm32_io.c
+++ b/configs/nucleo-l476rg/src/stm32_io.c
@@ -184,11 +184,13 @@ xcpt_t up_irqio(int id, xcpt_t irqhandler)
 
   if (id == 0)
     {
-      oldhandler = stm32_gpiosetevent(GPIO_D14, true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(GPIO_D14, true, true, true,
+                                      irqhandler, NULL);
     }
   else if (id == 1)
     {
-      oldhandler = stm32_gpiosetevent(GPIO_D15, true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(GPIO_D15, true, true, true,
+                                      irqhandler, NULL);
     }
 
   return oldhandler;
diff --git a/configs/nucleo-l476rg/src/stm32_wireless.c b/configs/nucleo-l476rg/src/stm32_wireless.c
index f28f8d33832..b65a5eaae5f 100644
--- a/configs/nucleo-l476rg/src/stm32_wireless.c
+++ b/configs/nucleo-l476rg/src/stm32_wireless.c
@@ -204,11 +204,13 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable)
   iinfo("enable:%d\n", enable);
   if (enable)
     {
-      (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, true, false, priv->handler);
+      (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, true, false,
+                               priv->handler, priv->arg);
     }
   else
     {
-      (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, false, false, NULL);
+      (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, false, false,
+                               NULL, NULL);
     }
 }
 
diff --git a/configs/olimex-efm32g880f128-stk/src/efm32_buttons.c b/configs/olimex-efm32g880f128-stk/src/efm32_buttons.c
index 7b3f6228abd..10c0df1ae00 100644
--- a/configs/olimex-efm32g880f128-stk/src/efm32_buttons.c
+++ b/configs/olimex-efm32g880f128-stk/src/efm32_buttons.c
@@ -168,7 +168,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_EFM32_GPIO_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/olimex-lpc1766stk/src/lpc17_buttons.c b/configs/olimex-lpc1766stk/src/lpc17_buttons.c
index 36b54237ac4..3b541d94024 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_buttons.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_buttons.c
@@ -182,7 +182,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_LPC17_GPIOIRQ)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
   irqstate_t flags;
diff --git a/configs/olimex-stm32-e407/src/stm32_buttons.c b/configs/olimex-stm32-e407/src/stm32_buttons.c
index 951df8ef1c4..32681e5e2d9 100644
--- a/configs/olimex-stm32-e407/src/stm32_buttons.c
+++ b/configs/olimex-stm32-e407/src/stm32_buttons.c
@@ -133,7 +133,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -142,7 +142,7 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
       oldhandler =
-        stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+        stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/olimex-stm32-e407/src/stm32_usb.c b/configs/olimex-stm32-e407/src/stm32_usb.c
index db93fcbf178..55df883ba8d 100644
--- a/configs/olimex-stm32-e407/src/stm32_usb.c
+++ b/configs/olimex-stm32-e407/src/stm32_usb.c
@@ -311,7 +311,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable)
 #ifdef CONFIG_USBHOST
 xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 {
-  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler);
+  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler, NULL);
 }
 #endif
 
diff --git a/configs/olimex-stm32-h405/src/stm32_buttons.c b/configs/olimex-stm32-h405/src/stm32_buttons.c
index aefe40fc8c3..03092eaece8 100644
--- a/configs/olimex-stm32-h405/src/stm32_buttons.c
+++ b/configs/olimex-stm32-h405/src/stm32_buttons.c
@@ -141,7 +141,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -149,7 +149,8 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/olimex-stm32-h407/src/stm32_buttons.c b/configs/olimex-stm32-h407/src/stm32_buttons.c
index 47873bf39b5..da8c5657654 100644
--- a/configs/olimex-stm32-h407/src/stm32_buttons.c
+++ b/configs/olimex-stm32-h407/src/stm32_buttons.c
@@ -133,7 +133,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -141,7 +141,8 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/olimex-stm32-h407/src/stm32_sdio.c b/configs/olimex-stm32-h407/src/stm32_sdio.c
index 05df07dee81..f87e76c741e 100644
--- a/configs/olimex-stm32-h407/src/stm32_sdio.c
+++ b/configs/olimex-stm32-h407/src/stm32_sdio.c
@@ -128,7 +128,8 @@ int stm32_sdio_initialize(void)
 
   /* Register an interrupt handler for the card detect pin */
 
-  stm32_gpiosetevent(GPIO_SDIO_NCD, true, true, true, stm32_ncd_interrupt);
+  stm32_gpiosetevent(GPIO_SDIO_NCD, true, true, true,
+                     stm32_ncd_interrupt, NULL);
 #endif
 
   /* Mount the SDIO-based MMC/SD block driver */
diff --git a/configs/olimex-stm32-h407/src/stm32_usb.c b/configs/olimex-stm32-h407/src/stm32_usb.c
index d948604a3b2..10cb1c16d46 100644
--- a/configs/olimex-stm32-h407/src/stm32_usb.c
+++ b/configs/olimex-stm32-h407/src/stm32_usb.c
@@ -289,7 +289,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable)
 #ifdef CONFIG_USBHOST
 xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 {
-  return stm32_gpiosetevent(GPIO_OTGHS_OVER, true, true, true, handler);
+  return stm32_gpiosetevent(GPIO_OTGHS_OVER, true, true, true, handler, NULL);
 }
 #endif
 
diff --git a/configs/olimex-stm32-p107/src/stm32_encx24j600.c b/configs/olimex-stm32-p107/src/stm32_encx24j600.c
index c5ec3b96636..6654c7bd329 100644
--- a/configs/olimex-stm32-p107/src/stm32_encx24j600.c
+++ b/configs/olimex-stm32-p107/src/stm32_encx24j600.c
@@ -151,12 +151,14 @@ static void up_enable(FAR const struct enc_lower_s *lower)
   FAR struct stm32_lower_s *priv = (FAR struct stm32_lower_s *)lower;
 
   DEBUGASSERT(priv->handler);
-  (void)stm32_gpiosetevent(GPIO_ENCX24J600_INTR, false, true, true, priv->handler);
+  (void)stm32_gpiosetevent(GPIO_ENCX24J600_INTR, false, true, true,
+                           priv->handler, NULL);
 }
 
 static void up_disable(FAR const struct enc_lower_s *lower)
 {
-  (void)stm32_gpiosetevent(GPIO_ENCX24J600_INTR, false, true, true, NULL);
+  (void)stm32_gpiosetevent(GPIO_ENCX24J600_INTR, false, true, true,
+                           NULL, NULL);
 }
 
 /****************************************************************************
diff --git a/configs/olimex-stm32-p207/src/stm32_buttons.c b/configs/olimex-stm32-p207/src/stm32_buttons.c
index 5caaeab8351..17c0cc50ff4 100644
--- a/configs/olimex-stm32-p207/src/stm32_buttons.c
+++ b/configs/olimex-stm32-p207/src/stm32_buttons.c
@@ -177,7 +177,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -185,7 +185,8 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/olimex-stm32-p207/src/stm32_usb.c b/configs/olimex-stm32-p207/src/stm32_usb.c
index 65198bf0041..9996da8b7fe 100644
--- a/configs/olimex-stm32-p207/src/stm32_usb.c
+++ b/configs/olimex-stm32-p207/src/stm32_usb.c
@@ -247,7 +247,7 @@ int stm32_usbhost_initialize(void)
 #ifdef CONFIG_USBHOST
 xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 {
-  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler);
+  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler, NULL);
 }
 #endif
 
diff --git a/configs/olimex-stm32-p407/src/stm32_buttons.c b/configs/olimex-stm32-p407/src/stm32_buttons.c
index 94580ec5a1c..463048055ef 100644
--- a/configs/olimex-stm32-p407/src/stm32_buttons.c
+++ b/configs/olimex-stm32-p407/src/stm32_buttons.c
@@ -177,7 +177,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -185,7 +185,8 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/olimex-stm32-p407/src/stm32_usb.c b/configs/olimex-stm32-p407/src/stm32_usb.c
index e6340dcc50f..4c3799e3af0 100644
--- a/configs/olimex-stm32-p407/src/stm32_usb.c
+++ b/configs/olimex-stm32-p407/src/stm32_usb.c
@@ -247,7 +247,7 @@ int stm32_usbhost_setup(void)
 #ifdef CONFIG_USBHOST
 xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 {
-  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler);
+  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler, NULL);
 }
 #endif
 
diff --git a/configs/olimexino-stm32/src/stm32_buttons.c b/configs/olimexino-stm32/src/stm32_buttons.c
index 85066d568f6..55021c3a948 100644
--- a/configs/olimexino-stm32/src/stm32_buttons.c
+++ b/configs/olimexino-stm32/src/stm32_buttons.c
@@ -133,7 +133,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -141,7 +141,8 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id == IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(BUTTON_BOOT0n, true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(BUTTON_BOOT0n, true, true, true,
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/olimexino-stm32/src/stm32_usbdev.c b/configs/olimexino-stm32/src/stm32_usbdev.c
index dd0846ae48c..148ae443129 100644
--- a/configs/olimexino-stm32/src/stm32_usbdev.c
+++ b/configs/olimexino-stm32/src/stm32_usbdev.c
@@ -77,7 +77,7 @@
 
 void stm32_usb_set_pwr_callback(xcpt_t pwr_changed_handler)
 {
-  (void) stm32_gpiosetevent(GPIO_USB_VBUS, true, true, true, pwr_changed_handler);
+  (void)stm32_gpiosetevent(GPIO_USB_VBUS, true, true, true, pwr_changed_handler, NULL);
 }
 
 /************************************************************************************
diff --git a/configs/open1788/src/lpc17_buttons.c b/configs/open1788/src/lpc17_buttons.c
index ca8f99278b9..c9313525524 100644
--- a/configs/open1788/src/lpc17_buttons.c
+++ b/configs/open1788/src/lpc17_buttons.c
@@ -200,7 +200,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_ARCH_IRQBUTTONS) && defined(CONFIG_LPC17_GPIOIRQ)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
   irqstate_t flags;
diff --git a/configs/pcduino-a10/src/a1x_buttons.c b/configs/pcduino-a10/src/a1x_buttons.c
index b9e1deff0fc..2cc53b81d6b 100644
--- a/configs/pcduino-a10/src/a1x_buttons.c
+++ b/configs/pcduino-a10/src/a1x_buttons.c
@@ -120,7 +120,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/pic32mz-starterkit/src/pic32mz_buttons.c b/configs/pic32mz-starterkit/src/pic32mz_buttons.c
index 4e26b559507..d5e06bd3104 100644
--- a/configs/pic32mz-starterkit/src/pic32mz_buttons.c
+++ b/configs/pic32mz-starterkit/src/pic32mz_buttons.c
@@ -152,7 +152,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
 #ifdef CONFIG_PIC32MZ_GPIOIRQ_PORTB
   xcpt_t oldhandler = NULL;
diff --git a/configs/sam3u-ek/src/sam_buttons.c b/configs/sam3u-ek/src/sam_buttons.c
index a995f19ab62..6bfdf269d54 100644
--- a/configs/sam3u-ek/src/sam_buttons.c
+++ b/configs/sam3u-ek/src/sam_buttons.c
@@ -80,7 +80,7 @@ static xcpt_t g_irqbutton2;
 
 #if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
 static xcpt_t board_button_irqx(gpio_pinset_t pinset, int irq,
-                                xcpt_t irqhandler, xcpt_t *store)
+                                xcpt_t irqhandler, xcpt_t *store, void *arg)
 {
   xcpt_t oldhandler;
   irqstate_t flags;
@@ -103,7 +103,7 @@ static xcpt_t board_button_irqx(gpio_pinset_t pinset, int irq,
       /* Configure the interrupt */
 
       sam_gpioirq(pinset);
-      (void)irq_attach(irq, irqhandler, NULL);
+      (void)irq_attach(irq, irqhandler, arg);
       sam_gpioirqenable(irq);
     }
   else
@@ -183,17 +183,17 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   if (id == BUTTON1)
     {
       return board_button_irqx(GPIO_BUTTON1, IRQ_BUTTON1,
-                               irqhandler, &g_irqbutton1);
+                               irqhandler, &g_irqbutton1, arg);
     }
   else if (id == BUTTON2)
     {
       return board_button_irqx(GPIO_BUTTON2, IRQ_BUTTON2,
-                               irqhandler, &g_irqbutton2);
+                               irqhandler, &g_irqbutton2, arg);
     }
   else
     {
diff --git a/configs/sam4e-ek/src/sam_buttons.c b/configs/sam4e-ek/src/sam_buttons.c
index 46ab285bd59..23851d10832 100644
--- a/configs/sam4e-ek/src/sam_buttons.c
+++ b/configs/sam4e-ek/src/sam_buttons.c
@@ -82,7 +82,7 @@ static xcpt_t g_irq_tamp;
 
 #if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
 static xcpt_t board_button_irqx(gpio_pinset_t pinset, int irq,
-                                xcpt_t irqhandler, xcpt_t *store)
+                                xcpt_t irqhandler, xcpt_t *store, void *arg)
 {
   xcpt_t oldhandler;
   irqstate_t flags;
@@ -105,7 +105,7 @@ static xcpt_t board_button_irqx(gpio_pinset_t pinset, int irq,
       /* Configure the interrupt */
 
       sam_gpioirq(pinset);
-      (void)irq_attach(irq, irqhandler, NULL);
+      (void)irq_attach(irq, irqhandler, arg);
       sam_gpioirqenable(irq);
     }
   else
@@ -189,25 +189,25 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   switch (id)
     {
       case BUTTON_SCROLLUP:
         return board_button_irqx(GPIO_SCROLLUP, IRQ_SCROLLUP,
-                                 irqhandler, &g_irq_scrollup);
+                                 irqhandler, &g_irq_scrollup, arg);
 
       case BUTTON_SCROLLDOWN:
         return board_button_irqx(GPIO_SCROLLDWN, IRQ_SCROLLDWN,
-                                 irqhandler, &g_irq_scrolldown);
+                                 irqhandler, &g_irq_scrolldown, arg);
 
       case BUTTON_WAKU:
         return board_button_irqx(GPIO_WAKU, IRQ_WAKU,
-                                 irqhandler, &g_irq_waku);
+                                 irqhandler, &g_irq_waku, arg);
 
       case BUTTON_TAMP:
         return board_button_irqx(GPIO_TAMP, IRQ_TAMP,
-                                 irqhandler, &g_irq_tamp);
+                                 irqhandler, &g_irq_tamp, arg);
 
       default:
         return NULL;
diff --git a/configs/sam4l-xplained/src/sam_buttons.c b/configs/sam4l-xplained/src/sam_buttons.c
index 63cc85efd77..9095bd820b5 100644
--- a/configs/sam4l-xplained/src/sam_buttons.c
+++ b/configs/sam4l-xplained/src/sam_buttons.c
@@ -124,7 +124,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/sam4s-xplained-pro/src/sam_buttons.c b/configs/sam4s-xplained-pro/src/sam_buttons.c
index 11b19b87b43..0a4f057dd8a 100644
--- a/configs/sam4s-xplained-pro/src/sam_buttons.c
+++ b/configs/sam4s-xplained-pro/src/sam_buttons.c
@@ -123,7 +123,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/sam4s-xplained/src/sam_buttons.c b/configs/sam4s-xplained/src/sam_buttons.c
index 3efa1df16e9..4ce25925927 100644
--- a/configs/sam4s-xplained/src/sam_buttons.c
+++ b/configs/sam4s-xplained/src/sam_buttons.c
@@ -124,7 +124,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_SAM34_GPIOA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/sama5d2-xult/src/sam_buttons.c b/configs/sama5d2-xult/src/sam_buttons.c
index dddab61307a..3dd77011814 100644
--- a/configs/sama5d2-xult/src/sam_buttons.c
+++ b/configs/sama5d2-xult/src/sam_buttons.c
@@ -133,7 +133,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_SAMA5_PIOB_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/sama5d3-xplained/src/sam_buttons.c b/configs/sama5d3-xplained/src/sam_buttons.c
index 93b51edaa2a..b2d0af924ea 100644
--- a/configs/sama5d3-xplained/src/sam_buttons.c
+++ b/configs/sama5d3-xplained/src/sam_buttons.c
@@ -137,7 +137,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_SAMA5_PIOE_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/sama5d3x-ek/src/sam_buttons.c b/configs/sama5d3x-ek/src/sam_buttons.c
index 180d80fcf96..d9ea68baa42 100644
--- a/configs/sama5d3x-ek/src/sam_buttons.c
+++ b/configs/sama5d3x-ek/src/sam_buttons.c
@@ -137,7 +137,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_SAMA5_PIOE_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/sama5d4-ek/src/sam_buttons.c b/configs/sama5d4-ek/src/sam_buttons.c
index 9b4fd75a8ca..b0fa42ecde3 100644
--- a/configs/sama5d4-ek/src/sam_buttons.c
+++ b/configs/sama5d4-ek/src/sam_buttons.c
@@ -133,7 +133,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_SAMA5_PIOE_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/samd20-xplained/src/sam_buttons.c b/configs/samd20-xplained/src/sam_buttons.c
index 59ffa0bd41b..5edeb965d8a 100644
--- a/configs/samd20-xplained/src/sam_buttons.c
+++ b/configs/samd20-xplained/src/sam_buttons.c
@@ -124,7 +124,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_PORTA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/samd21-xplained/src/sam_buttons.c b/configs/samd21-xplained/src/sam_buttons.c
index ee63c024d6b..cb5806f748a 100644
--- a/configs/samd21-xplained/src/sam_buttons.c
+++ b/configs/samd21-xplained/src/sam_buttons.c
@@ -124,7 +124,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_PORTA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/same70-xplained/src/sam_buttons.c b/configs/same70-xplained/src/sam_buttons.c
index 46813e9ae4d..251cf113c0e 100644
--- a/configs/same70-xplained/src/sam_buttons.c
+++ b/configs/same70-xplained/src/sam_buttons.c
@@ -89,7 +89,7 @@ static xcpt_t g_irq_sw0;
 
 #ifdef HAVE_IRQBUTTONS
 static xcpt_t board_button_irqx(gpio_pinset_t pinset, int irq,
-                                xcpt_t irqhandler, xcpt_t *store)
+                                xcpt_t irqhandler, xcpt_t *store, void *arg)
 {
   xcpt_t oldhandler;
   irqstate_t flags;
@@ -112,7 +112,7 @@ static xcpt_t board_button_irqx(gpio_pinset_t pinset, int irq,
       /* Configure the interrupt */
 
       sam_gpioirq(pinset);
-      (void)irq_attach(irq, irqhandler, NULL);
+      (void)irq_attach(irq, irqhandler, arg);
       sam_gpioirqenable(irq);
     }
   else
@@ -188,12 +188,12 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
 #ifdef HAVE_IRQBUTTONS
   if (id == BUTTON_SW0)
     {
-      return board_button_irqx(GPIO_SW0, IRQ_SW0, irqhandler, &g_irq_sw0);
+      return board_button_irqx(GPIO_SW0, IRQ_SW0, irqhandler, &g_irq_sw0, arg);
     }
 #endif
 
diff --git a/configs/saml21-xplained/src/sam_buttons.c b/configs/saml21-xplained/src/sam_buttons.c
index c5f3226d4f7..303a95a084f 100644
--- a/configs/saml21-xplained/src/sam_buttons.c
+++ b/configs/saml21-xplained/src/sam_buttons.c
@@ -124,7 +124,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #if defined(CONFIG_PORTA_IRQ) && defined(CONFIG_ARCH_IRQBUTTONS)
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/samv71-xult/src/sam_buttons.c b/configs/samv71-xult/src/sam_buttons.c
index 70df9a1b6da..7e2ecd1b404 100644
--- a/configs/samv71-xult/src/sam_buttons.c
+++ b/configs/samv71-xult/src/sam_buttons.c
@@ -92,7 +92,7 @@ static xcpt_t g_irq_sw1;
 
 #ifdef HAVE_IRQBUTTONS
 static xcpt_t board_button_irqx(gpio_pinset_t pinset, int irq,
-                                xcpt_t irqhandler, xcpt_t *store)
+                                xcpt_t irqhandler, xcpt_t *store, void *arg)
 {
   xcpt_t oldhandler;
   irqstate_t flags;
@@ -115,7 +115,7 @@ static xcpt_t board_button_irqx(gpio_pinset_t pinset, int irq,
       /* Configure the interrupt */
 
       sam_gpioirq(pinset);
-      (void)irq_attach(irq, irqhandler, NULL);
+      (void)irq_attach(irq, irqhandler, arg);
       sam_gpioirqenable(irq);
     }
   else
@@ -208,7 +208,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
 #ifdef HAVE_IRQBUTTONS
 
@@ -216,12 +216,12 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
     {
 #ifdef CONFIG_SAMV7_GPIOA_IRQ
       case BUTTON_SW0:
-        return board_button_irqx(GPIO_SW0, IRQ_SW0, irqhandler, &g_irq_sw0);
+        return board_button_irqx(GPIO_SW0, IRQ_SW0, irqhandler, &g_irq_sw0, arg);
 #endif
 
 #ifdef CONFIG_SAMV7_GPIOB_IRQ
       case BUTTON_SW1:
-        return board_button_irqx(GPIO_SW1, IRQ_SW1, irqhandler, &g_irq_sw1);
+        return board_button_irqx(GPIO_SW1, IRQ_SW1, irqhandler, &g_irq_sw1, arg);
 #endif
 
       default:
diff --git a/configs/shenzhou/src/stm32_buttons.c b/configs/shenzhou/src/stm32_buttons.c
index cf31d666e82..2d90fafcc16 100644
--- a/configs/shenzhou/src/stm32_buttons.c
+++ b/configs/shenzhou/src/stm32_buttons.c
@@ -156,7 +156,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -164,7 +164,8 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
+                                      irqhandler, arg);
     }
   return oldhandler;
 }
diff --git a/configs/shenzhou/src/stm32_touchscreen.c b/configs/shenzhou/src/stm32_touchscreen.c
index dec42e95ffa..99b3971df80 100644
--- a/configs/shenzhou/src/stm32_touchscreen.c
+++ b/configs/shenzhou/src/stm32_touchscreen.c
@@ -185,11 +185,12 @@ static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable)
   if (enable)
     {
       (void)stm32_gpiosetevent(GPIO_TP_INT, true, true, false,
-                               priv->handler);
+                               priv->handler, NULL);
     }
   else
     {
-      (void)stm32_gpiosetevent(GPIO_TP_INT, false, false, false, NULL);
+      (void)stm32_gpiosetevent(GPIO_TP_INT, false, false, false,
+                               NULL, NULL);
     }
 }
 
diff --git a/configs/spark/src/stm32_buttons.c b/configs/spark/src/stm32_buttons.c
index 4f4224146ed..d38a868cc59 100644
--- a/configs/spark/src/stm32_buttons.c
+++ b/configs/spark/src/stm32_buttons.c
@@ -120,7 +120,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -128,8 +128,9 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id == BUTTON_USER)
     {
-      oldhandler = stm32_gpiosetevent(GPIO_BTN, true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(GPIO_BTN, true, true, true, irqhandler, arg);
     }
+
   return oldhandler;
 }
 #endif
diff --git a/configs/spark/src/stm32_io.c b/configs/spark/src/stm32_io.c
index 404cd4143ae..5730abe689d 100644
--- a/configs/spark/src/stm32_io.c
+++ b/configs/spark/src/stm32_io.c
@@ -183,11 +183,13 @@ xcpt_t up_irqio(int id, xcpt_t irqhandler)
 
   if (id == 0)
     {
-      oldhandler = stm32_gpiosetevent(GPIO_D0, true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(GPIO_D0, true, true, true,
+                                      irqhandler, NULL);
     }
   else if (id == 1)
     {
-      oldhandler = stm32_gpiosetevent(GPIO_D1, true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(GPIO_D1, true, true, true,
+                                      irqhandler, NULL);
     }
 
   return oldhandler;
diff --git a/configs/spark/src/stm32_wireless.c b/configs/spark/src/stm32_wireless.c
index 962faa93549..afd0f9a819d 100644
--- a/configs/spark/src/stm32_wireless.c
+++ b/configs/spark/src/stm32_wireless.c
@@ -205,11 +205,13 @@ static void wl_enable_irq(FAR struct cc3000_config_s *state, bool enable)
   iinfo("enable:%d\n", enable);
   if (enable)
     {
-      (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, true, false, priv->handler);
+      (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, true, false,
+                               priv->handler, priv->arg);
     }
   else
     {
-      (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, false, false, NULL);
+      (void)stm32_gpiosetevent(GPIO_WIFI_INT, false, false, false,
+                               NULL, NULL);
     }
 }
 
diff --git a/configs/stm3210e-eval/src/stm32_buttons.c b/configs/stm3210e-eval/src/stm32_buttons.c
index 526309f0178..a2dc1c6cf7e 100644
--- a/configs/stm3210e-eval/src/stm32_buttons.c
+++ b/configs/stm3210e-eval/src/stm32_buttons.c
@@ -161,7 +161,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -169,7 +169,8 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/stm3210e-eval/src/stm32_djoystick.c b/configs/stm3210e-eval/src/stm32_djoystick.c
index 72d5009e705..40e8e3bf265 100644
--- a/configs/stm3210e-eval/src/stm32_djoystick.c
+++ b/configs/stm3210e-eval/src/stm32_djoystick.c
@@ -213,7 +213,7 @@ static void djoy_enable(FAR const struct djoy_lowerhalf_s *lower,
                       i, rising, falling);
 
                (void)stm32_gpiosetevent(g_joygpio[i], rising, falling,
-                                        true, djoy_interrupt);
+                                        true, djoy_interrupt, NULL);
              }
         }
     }
@@ -239,7 +239,7 @@ static void djoy_disable(void)
   flags = enter_critical_section();
   for (i = 0; i < DJOY_NGPIOS; i++)
     {
-      (void)stm32_gpiosetevent(g_joygpio[i], false, false, false, NULL);
+      (void)stm32_gpiosetevent(g_joygpio[i], false, false, false, NULL, NULL);
     }
 
   leave_critical_section(flags);
diff --git a/configs/stm3210e-eval/src/stm32_idle.c b/configs/stm3210e-eval/src/stm32_idle.c
index e50aac3c854..5073218ad0a 100644
--- a/configs/stm3210e-eval/src/stm32_idle.c
+++ b/configs/stm3210e-eval/src/stm32_idle.c
@@ -177,7 +177,7 @@ static int stm32_alarm_exti(int irq, FAR void *context)
 #if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM)
 static void stm32_exti_cancel(void)
 {
-  (void)stm32_exti_alarm(false, false, false, NULL);
+  (void)stm32_exti_alarm(false, false, false, NULL, NULL);
 }
 #endif
 
@@ -201,7 +201,7 @@ static int stm32_rtc_alarm(time_t tv_sec, time_t tv_nsec, bool exti)
     {
       /* TODO: Make sure that that is no pending EXTI interrupt */
 
-      (void)stm32_exti_alarm(true, true, true, stm32_alarm_exti);
+      (void)stm32_exti_alarm(true, true, true, stm32_alarm_exti, NULL);
     }
 
   /* Configure the RTC alarm to Auto Wake the system */
diff --git a/configs/stm3210e-eval/src/stm32_lm75.c b/configs/stm3210e-eval/src/stm32_lm75.c
index ba0591fb87c..a238bf7d637 100644
--- a/configs/stm3210e-eval/src/stm32_lm75.c
+++ b/configs/stm3210e-eval/src/stm32_lm75.c
@@ -114,7 +114,7 @@ int stm32_lm75initialize(FAR const char *devpath)
 
 xcpt_t stm32_lm75attach(xcpt_t irqhandler)
 {
-  return stm32_gpiosetevent(GPIO_LM75_OSINT, true, true, true, irqhandler);
+  return stm32_gpiosetevent(GPIO_LM75_OSINT, true, true, true, irqhandler, NULL);
 }
 
 #endif /* CONFIG_I2C && CONFIG_I2C_LM75 && CONFIG_STM32_I2C1 */
diff --git a/configs/stm3220g-eval/src/stm32_buttons.c b/configs/stm3220g-eval/src/stm32_buttons.c
index 85db973fa55..ec5428eb069 100644
--- a/configs/stm3220g-eval/src/stm32_buttons.c
+++ b/configs/stm3220g-eval/src/stm32_buttons.c
@@ -157,7 +157,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -165,8 +165,10 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
+                                      irqhandler, arg);
     }
+
   return oldhandler;
 }
 #endif
diff --git a/configs/stm3220g-eval/src/stm32_stmpe811.c b/configs/stm3220g-eval/src/stm32_stmpe811.c
index 7b3ffc332ab..ec79a318644 100644
--- a/configs/stm3220g-eval/src/stm32_stmpe811.c
+++ b/configs/stm3220g-eval/src/stm32_stmpe811.c
@@ -240,14 +240,17 @@ static void stmpe811_enable(FAR struct stmpe811_config_s *state, bool enable)
     {
       /* Configure the EXTI interrupt using the SAVED handler */
 
-      (void)stm32_gpiosetevent(GPIO_IO_EXPANDER, true, true, true, priv->handler);
+      (void)stm32_gpiosetevent(GPIO_IO_EXPANDER, true, true, true,
+                               priv->handler, priv->arg);
     }
   else
     {
       /* Configure the EXTI interrupt with a NULL handler to disable it */
 
-     (void)stm32_gpiosetevent(GPIO_IO_EXPANDER, false, false, false, NULL);
+     (void)stm32_gpiosetevent(GPIO_IO_EXPANDER, false, false, false,
+                              NULL, NULL);
     }
+
   leave_critical_section(flags);
 }
 
diff --git a/configs/stm3220g-eval/src/stm32_usb.c b/configs/stm3220g-eval/src/stm32_usb.c
index adecafb76df..371daed38ad 100644
--- a/configs/stm3220g-eval/src/stm32_usb.c
+++ b/configs/stm3220g-eval/src/stm32_usb.c
@@ -282,7 +282,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable)
 #ifdef CONFIG_USBHOST
 xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 {
-  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler);
+  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler, NULL);
 }
 #endif
 
diff --git a/configs/stm3240g-eval/src/stm32_buttons.c b/configs/stm3240g-eval/src/stm32_buttons.c
index e3e761b217b..db034d5a4e3 100644
--- a/configs/stm3240g-eval/src/stm32_buttons.c
+++ b/configs/stm3240g-eval/src/stm32_buttons.c
@@ -157,7 +157,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -165,8 +165,10 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
+                                      irqhandler, arg);
     }
+
   return oldhandler;
 }
 #endif
diff --git a/configs/stm3240g-eval/src/stm32_stmpe811.c b/configs/stm3240g-eval/src/stm32_stmpe811.c
index 147bf4f9523..b1b8126c579 100644
--- a/configs/stm3240g-eval/src/stm32_stmpe811.c
+++ b/configs/stm3240g-eval/src/stm32_stmpe811.c
@@ -240,14 +240,17 @@ static void stmpe811_enable(FAR struct stmpe811_config_s *state, bool enable)
     {
       /* Configure the EXTI interrupt using the SAVED handler */
 
-      (void)stm32_gpiosetevent(GPIO_IO_EXPANDER, true, true, true, priv->handler);
+      (void)stm32_gpiosetevent(GPIO_IO_EXPANDER, true, true, true,
+                               priv->handler, priv->arg);
     }
   else
     {
       /* Configure the EXTI interrupt with a NULL handler to disable it */
 
-     (void)stm32_gpiosetevent(GPIO_IO_EXPANDER, false, false, false, NULL);
+     (void)stm32_gpiosetevent(GPIO_IO_EXPANDER, false, false, false,
+                              NULL, NULL);
     }
+
   leave_critical_section(flags);
 }
 
diff --git a/configs/stm3240g-eval/src/stm32_usb.c b/configs/stm3240g-eval/src/stm32_usb.c
index 71d51ce9ed4..7c5494a501b 100644
--- a/configs/stm3240g-eval/src/stm32_usb.c
+++ b/configs/stm3240g-eval/src/stm32_usb.c
@@ -282,7 +282,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable)
 #ifdef CONFIG_USBHOST
 xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 {
-  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler);
+  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler, NULL);
 }
 #endif
 
diff --git a/configs/stm32_tiny/src/stm32_wireless.c b/configs/stm32_tiny/src/stm32_wireless.c
index cebd1a3e5ae..ef3fc3f54cb 100644
--- a/configs/stm32_tiny/src/stm32_wireless.c
+++ b/configs/stm32_tiny/src/stm32_wireless.c
@@ -83,7 +83,7 @@ static int stm32tiny_wl_irq_attach(xcpt_t isr, FAR void *arg)
   _info("Attach IRQ\n");
   g_isr = isr;
   g_arg = arg;
-  stm32_gpiosetevent(GPIO_NRF24L01_IRQ, false, true, false, g_isr);
+  stm32_gpiosetevent(GPIO_NRF24L01_IRQ, false, true, false, g_isr, g_arg);
   return OK;
 }
 
diff --git a/configs/stm32butterfly2/src/stm32_mmcsd.c b/configs/stm32butterfly2/src/stm32_mmcsd.c
index 4ccd3516006..d045d05c710 100644
--- a/configs/stm32butterfly2/src/stm32_mmcsd.c
+++ b/configs/stm32butterfly2/src/stm32_mmcsd.c
@@ -196,7 +196,7 @@ int stm32_mmcsd_initialize(int minor)
       return rv;
     }
 
-  stm32_gpiosetevent(GPIO_SD_CD, true, true, true, stm32_cd);
+  stm32_gpiosetevent(GPIO_SD_CD, true, true, true, stm32_cd, NULL);
 
   sem_init(&g_cdsem, 0, 0);
   pthread_attr_init(&pattr);
diff --git a/configs/stm32f103-minimum/src/stm32_buttons.c b/configs/stm32f103-minimum/src/stm32_buttons.c
index d611bf44fb2..96fd053eef3 100644
--- a/configs/stm32f103-minimum/src/stm32_buttons.c
+++ b/configs/stm32f103-minimum/src/stm32_buttons.c
@@ -152,7 +152,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -161,7 +161,7 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
       oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
-                                      irqhandler);
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/stm32f103-minimum/src/stm32_wireless.c b/configs/stm32f103-minimum/src/stm32_wireless.c
index 6a25abaa87e..e5d7c21073d 100644
--- a/configs/stm32f103-minimum/src/stm32_wireless.c
+++ b/configs/stm32f103-minimum/src/stm32_wireless.c
@@ -85,7 +85,7 @@ static int stm32tiny_wl_irq_attach(xcpt_t isr, FAR void *arg)
   winfo("Attach IRQ\n");
   g_isr = isr;
   g_arg = arg;
-  stm32_gpiosetevent(GPIO_NRF24L01_IRQ, false, true, false, g_isr);
+  stm32_gpiosetevent(GPIO_NRF24L01_IRQ, false, true, false, g_isr, g_arg);
   return OK;
 }
 
diff --git a/configs/stm32f3discovery/src/stm32_buttons.c b/configs/stm32f3discovery/src/stm32_buttons.c
index db0d6418313..f15c22f8a9c 100644
--- a/configs/stm32f3discovery/src/stm32_buttons.c
+++ b/configs/stm32f3discovery/src/stm32_buttons.c
@@ -152,7 +152,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -160,7 +160,8 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/stm32f429i-disco/src/stm32_buttons.c b/configs/stm32f429i-disco/src/stm32_buttons.c
index 6dbe3cba7a9..396b8750546 100644
--- a/configs/stm32f429i-disco/src/stm32_buttons.c
+++ b/configs/stm32f429i-disco/src/stm32_buttons.c
@@ -152,7 +152,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -160,8 +160,10 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
+                                      irqhandler, arg);
     }
+
   return oldhandler;
 }
 #endif
diff --git a/configs/stm32f429i-disco/src/stm32_l3gd20.c b/configs/stm32f429i-disco/src/stm32_l3gd20.c
index 0bf73ce9f92..1d6dd2cc2d5 100644
--- a/configs/stm32f429i-disco/src/stm32_l3gd20.c
+++ b/configs/stm32f429i-disco/src/stm32_l3gd20.c
@@ -87,9 +87,7 @@ static struct l3gd20_config_s g_l3gd20_config =
 
 static int l3gd20_attach(FAR struct l3gd20_config_s * cfg, xcpt_t irq)
 {
-  stm32_gpiosetevent(GPIO_L3GD20_DREADY, true, false, true, irq);
-
-  return OK;
+  stm32_gpiosetevent(GPIO_L3GD20_DREADY, true, false, true, irq, NULL);
 }
 
 /****************************************************************************
diff --git a/configs/stm32f429i-disco/src/stm32_stmpe811.c b/configs/stm32f429i-disco/src/stm32_stmpe811.c
index 7cd8b08db71..13c0a91dc79 100644
--- a/configs/stm32f429i-disco/src/stm32_stmpe811.c
+++ b/configs/stm32f429i-disco/src/stm32_stmpe811.c
@@ -244,14 +244,16 @@ static void stmpe811_enable(FAR struct stmpe811_config_s *state, bool enable)
       /* Configure the EXTI interrupt using the SAVED handler */
 
       (void)stm32_gpiosetevent(GPIO_IO_EXPANDER, true, true, true,
-                               priv->handler);
+                               priv->handler, priv->arg);
     }
   else
     {
       /* Configure the EXTI interrupt with a NULL handler to disable it */
 
-     (void)stm32_gpiosetevent(GPIO_IO_EXPANDER, false, false, false, NULL);
+     (void)stm32_gpiosetevent(GPIO_IO_EXPANDER, false, false, false,
+                              NULL, NULL);
     }
+`
   leave_critical_section(flags);
 }
 
diff --git a/configs/stm32f429i-disco/src/stm32_usb.c b/configs/stm32f429i-disco/src/stm32_usb.c
index 011726a69b1..3daa643edca 100644
--- a/configs/stm32f429i-disco/src/stm32_usb.c
+++ b/configs/stm32f429i-disco/src/stm32_usb.c
@@ -288,7 +288,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable)
 #ifdef CONFIG_USBHOST
 xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 {
-  return stm32_gpiosetevent(GPIO_OTGHS_OVER, true, true, true, handler);
+  return stm32_gpiosetevent(GPIO_OTGHS_OVER, true, true, true, handler, NULL);
 }
 #endif
 
diff --git a/configs/stm32f4discovery/src/stm32_buttons.c b/configs/stm32f4discovery/src/stm32_buttons.c
index b068e03dad2..5143fd8eca0 100644
--- a/configs/stm32f4discovery/src/stm32_buttons.c
+++ b/configs/stm32f4discovery/src/stm32_buttons.c
@@ -152,7 +152,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -160,8 +160,10 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
+                                      irqhandler, arg);
     }
+
   return oldhandler;
 }
 #endif
diff --git a/configs/stm32f4discovery/src/stm32_ethernet.c b/configs/stm32f4discovery/src/stm32_ethernet.c
index 67b7b9e95e3..0cc23c60167 100644
--- a/configs/stm32f4discovery/src/stm32_ethernet.c
+++ b/configs/stm32f4discovery/src/stm32_ethernet.c
@@ -112,13 +112,15 @@ static void stm32_emac0_phy_enable(bool enable)
     {
       /* Attach and enable GPIO interrupt (and event) on the falling edge */
 
-      (void)stm32_gpiosetevent(GPIO_EMAC_NINT, false, true, true, g_ethmac_handler);
+      (void)stm32_gpiosetevent(GPIO_EMAC_NINT, false, true, true,
+                               g_ethmac_handler, NULL);
     }
   else
     {
       /* Detach and disable GPIO interrupt */
 
-      (void)stm32_gpiosetevent(GPIO_EMAC_NINT, false, false, false, NULL);
+      (void)stm32_gpiosetevent(GPIO_EMAC_NINT, false, false, false,
+                               NULL, NULL);
     }
 }
 #endif
diff --git a/configs/stm32f4discovery/src/stm32_sdio.c b/configs/stm32f4discovery/src/stm32_sdio.c
index a82a38d3488..d7271c7cab9 100644
--- a/configs/stm32f4discovery/src/stm32_sdio.c
+++ b/configs/stm32f4discovery/src/stm32_sdio.c
@@ -128,7 +128,8 @@ int stm32_sdio_initialize(void)
 
   /* Register an interrupt handler for the card detect pin */
 
-  stm32_gpiosetevent(GPIO_SDIO_NCD, true, true, true, stm32_ncd_interrupt);
+  stm32_gpiosetevent(GPIO_SDIO_NCD, true, true, true,
+                     stm32_ncd_interrupt, NULL);
 #endif
 
   /* Mount the SDIO-based MMC/SD block driver */
diff --git a/configs/stm32f4discovery/src/stm32_usb.c b/configs/stm32f4discovery/src/stm32_usb.c
index 397aaff76df..f6571406540 100644
--- a/configs/stm32f4discovery/src/stm32_usb.c
+++ b/configs/stm32f4discovery/src/stm32_usb.c
@@ -311,7 +311,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable)
 #ifdef CONFIG_USBHOST
 xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 {
-  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler);
+  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler, NULL);
 }
 #endif
 
diff --git a/configs/stm32f4discovery/src/stm32_xen1210.c b/configs/stm32f4discovery/src/stm32_xen1210.c
index edd37f5da51..b6363a1e2ec 100644
--- a/configs/stm32f4discovery/src/stm32_xen1210.c
+++ b/configs/stm32f4discovery/src/stm32_xen1210.c
@@ -211,13 +211,14 @@ static void xen1210_enable(FAR struct xen1210_config_s *state, bool enable)
 
       stm32_configgpio(GPIO_XEN1210_INT);
       (void)stm32_gpiosetevent(GPIO_XEN1210_INT, false, true,
-                               true, xen1210_interrupt);
+                               true, xen1210_interrupt, NULL);
     }
   else
     {
       /* Configure the interrupt with a NULL handler to disable it */
 
-      (void)stm32_gpiosetevent(GPIO_XEN1210_INT, false, false, false, NULL);
+      (void)stm32_gpiosetevent(GPIO_XEN1210_INT, false, false, false,
+                               NULL, NULL);
     }
 
   leave_critical_section(flags);
diff --git a/configs/stm32f4discovery/src/stm32_zerocross.c b/configs/stm32f4discovery/src/stm32_zerocross.c
index af0b99b860a..92703f56615 100644
--- a/configs/stm32f4discovery/src/stm32_zerocross.c
+++ b/configs/stm32f4discovery/src/stm32_zerocross.c
@@ -120,7 +120,7 @@ static void zcross_enable(FAR const struct zc_lowerhalf_s *lower,
     }
 
   (void)stm32_gpiosetevent(GPIO_ZEROCROSS, rising, falling,
-                           true, zcross_interrupt);
+                           true, zcross_interrupt, NULL);
 
   leave_critical_section(flags);
 }
diff --git a/configs/stm32f746-ws/src/stm32_sdmmc.c b/configs/stm32f746-ws/src/stm32_sdmmc.c
index 9dfaaa34a71..dce13b291da 100644
--- a/configs/stm32f746-ws/src/stm32_sdmmc.c
+++ b/configs/stm32f746-ws/src/stm32_sdmmc.c
@@ -126,7 +126,8 @@ int stm32_sdio_initialize(void)
 
   /* Register an interrupt handler for the card detect pin */
 
-  stm32_gpiosetevent(GPIO_SDIO_NCD, true, true, true, stm32_ncd_interrupt);
+  stm32_gpiosetevent(GPIO_SDIO_NCD, true, true, true,
+                     stm32_ncd_interrupt, NULL);
 #endif
 
   /* Mount the SDIO-based MMC/SD block driver */
diff --git a/configs/stm32f746-ws/src/stm32_usb.c b/configs/stm32f746-ws/src/stm32_usb.c
index 770f950fa06..84f782c5ef9 100644
--- a/configs/stm32f746-ws/src/stm32_usb.c
+++ b/configs/stm32f746-ws/src/stm32_usb.c
@@ -314,7 +314,7 @@ void stm32_usbhost_vbusdrive(int iface, bool enable)
 #ifdef CONFIG_USBHOST
 xcpt_t stm32_setup_overcurrent(xcpt_t handler)
 {
-  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler);
+  return stm32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler, NULL);
 }
 #endif
 
diff --git a/configs/stm32f746g-disco/src/stm32_buttons.c b/configs/stm32f746g-disco/src/stm32_buttons.c
index 8578c0794ed..43051e49604 100644
--- a/configs/stm32f746g-disco/src/stm32_buttons.c
+++ b/configs/stm32f746g-disco/src/stm32_buttons.c
@@ -104,7 +104,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
 #warning Missing logic
 }
diff --git a/configs/stm32l476-mdk/src/stm32_buttons.c b/configs/stm32l476-mdk/src/stm32_buttons.c
index a59430ec82b..a44849bf4a1 100644
--- a/configs/stm32l476-mdk/src/stm32_buttons.c
+++ b/configs/stm32l476-mdk/src/stm32_buttons.c
@@ -150,7 +150,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/stm32l476vg-disco/src/stm32_buttons.c b/configs/stm32l476vg-disco/src/stm32_buttons.c
index b113718c9a1..ca96eecf71f 100644
--- a/configs/stm32l476vg-disco/src/stm32_buttons.c
+++ b/configs/stm32l476vg-disco/src/stm32_buttons.c
@@ -325,7 +325,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/stm32ldiscovery/src/stm32_buttons.c b/configs/stm32ldiscovery/src/stm32_buttons.c
index 5427ac751b1..b703bf8d2de 100644
--- a/configs/stm32ldiscovery/src/stm32_buttons.c
+++ b/configs/stm32ldiscovery/src/stm32_buttons.c
@@ -152,7 +152,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -160,7 +160,8 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/stm32vldiscovery/src/stm32_buttons.c b/configs/stm32vldiscovery/src/stm32_buttons.c
index 87442c115e1..63be9ee2a17 100644
--- a/configs/stm32vldiscovery/src/stm32_buttons.c
+++ b/configs/stm32vldiscovery/src/stm32_buttons.c
@@ -107,12 +107,14 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
   if (id == 0)
-    oldhandler = stm32_gpiosetevent(GPIO_BTN_0, true, true, true, irqhandler);
+    {
+      oldhandler = stm32_gpiosetevent(GPIO_BTN_0, true, true, true, irqhandler, arg);
+    }
 
   return oldhandler;
 }
diff --git a/configs/sure-pic32mx/src/pic32mx_buttons.c b/configs/sure-pic32mx/src/pic32mx_buttons.c
index 62e0330c410..8de2633e2f6 100644
--- a/configs/sure-pic32mx/src/pic32mx_buttons.c
+++ b/configs/sure-pic32mx/src/pic32mx_buttons.c
@@ -206,7 +206,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/tm4c123g-launchpad/src/tm4c_buttons.c b/configs/tm4c123g-launchpad/src/tm4c_buttons.c
index 57c285ea60b..a151bce0caf 100644
--- a/configs/tm4c123g-launchpad/src/tm4c_buttons.c
+++ b/configs/tm4c123g-launchpad/src/tm4c_buttons.c
@@ -149,7 +149,7 @@ uint8_t board_buttons(void)
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
   uint32_t pinset= 0;
diff --git a/configs/twr-k60n512/src/k60_buttons.c b/configs/twr-k60n512/src/k60_buttons.c
index 0cda4324838..6a936935da1 100644
--- a/configs/twr-k60n512/src/k60_buttons.c
+++ b/configs/twr-k60n512/src/k60_buttons.c
@@ -134,7 +134,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler;
   uint32_t pinset;
diff --git a/configs/ubw32/src/pic32_buttons.c b/configs/ubw32/src/pic32_buttons.c
index 290832c3690..dec8fe416eb 100644
--- a/configs/ubw32/src/pic32_buttons.c
+++ b/configs/ubw32/src/pic32_buttons.c
@@ -181,7 +181,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
diff --git a/configs/viewtool-stm32f107/src/stm32_buttons.c b/configs/viewtool-stm32f107/src/stm32_buttons.c
index cff85be4c6e..97b02d1c5c3 100644
--- a/configs/viewtool-stm32f107/src/stm32_buttons.c
+++ b/configs/viewtool-stm32f107/src/stm32_buttons.c
@@ -152,7 +152,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t oldhandler = NULL;
 
@@ -160,7 +160,8 @@ xcpt_t board_button_irq(int id, xcpt_t irqhandler)
 
   if (id >= MIN_IRQBUTTON && id <= MAX_IRQBUTTON)
     {
-      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true, irqhandler);
+      oldhandler = stm32_gpiosetevent(g_buttons[id], true, true, true,
+                                      irqhandler, arg);
     }
 
   return oldhandler;
diff --git a/configs/viewtool-stm32f107/src/stm32_touchscreen.c b/configs/viewtool-stm32f107/src/stm32_touchscreen.c
index 6abba71e5cd..8d6bc3c2593 100644
--- a/configs/viewtool-stm32f107/src/stm32_touchscreen.c
+++ b/configs/viewtool-stm32f107/src/stm32_touchscreen.c
@@ -201,13 +201,15 @@ static void tsc_enable(FAR struct ads7843e_config_s *state, bool enable)
     {
       /* Configure the EXTI interrupt using the SAVED handler */
 
-      (void)stm32_gpiosetevent(GPIO_LCDTP_IRQ, true, true, true, priv->handler);
+      (void)stm32_gpiosetevent(GPIO_LCDTP_IRQ, true, true, true,
+                               priv->handler, NULL);
     }
   else
     {
       /* Configure the EXTI interrupt with a NULL handler to disable it */
 
-     (void)stm32_gpiosetevent(GPIO_LCDTP_IRQ, false, false, false, NULL);
+     (void)stm32_gpiosetevent(GPIO_LCDTP_IRQ, false, false, false,
+                              NULL, NULL);
     }
 
   leave_critical_section(flags);
diff --git a/configs/zkit-arm-1769/src/lpc17_buttons.c b/configs/zkit-arm-1769/src/lpc17_buttons.c
index f8a479f8cca..24d60216938 100644
--- a/configs/zkit-arm-1769/src/lpc17_buttons.c
+++ b/configs/zkit-arm-1769/src/lpc17_buttons.c
@@ -160,7 +160,7 @@ uint8_t board_buttons(void)
  ************************************************************************************/
 
 #if defined CONFIG_ARCH_IRQBUTTONS && CONFIG_LPC17_GPIOIRQ
-xcpt_t board_button_irq(int id, xcpt_t irqhandler)
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg)
 {
   xcpt_t rethandler = NULL;
   irqstate_t flags;
diff --git a/drivers/input/button_lower.c b/drivers/input/button_lower.c
index 53f99be9077..b2b830f8f56 100644
--- a/drivers/input/button_lower.c
+++ b/drivers/input/button_lower.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * drivers/input/button_lower.c
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -159,7 +159,7 @@ static void btn_enable(FAR const struct btn_lowerhalf_s *lower,
           mask = (1 << id);
           if ((either & mask) != 0)
             {
-              (void)board_button_irq(id, btn_interrupt);
+              (void)board_button_irq(id, btn_interrupt, NULL);
             }
         }
     }
@@ -185,7 +185,7 @@ static void btn_disable(void)
   flags = enter_critical_section();
   for (id = 0; id < NUM_BUTTONS; id++)
     {
-      (void)board_button_irq(id, NULL);
+      (void)board_button_irq(id, NULL, NULL);
     }
 
   /* Nullify the handler and argument */
diff --git a/include/nuttx/board.h b/include/nuttx/board.h
index f31398548d4..633ea9c6839 100644
--- a/include/nuttx/board.h
+++ b/include/nuttx/board.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/nuttx/board.h
  *
- *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015-2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -614,7 +614,7 @@ uint8_t board_buttons(void);
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_IRQBUTTONS
-xcpt_t board_button_irq(int id, xcpt_t irqhandler);
+xcpt_t board_button_irq(int id, xcpt_t irqhandler, FAR void *arg);
 #endif
 
 /****************************************************************************