diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c
index 34a8bdb3d8..e08a08cc20 100644
--- a/arch/arm/src/stm32f7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32f7/stm32_sdmmc.c
@@ -481,10 +481,10 @@ static int stm32_sdmmc2_interrupt(int irq, void *context, void *arg);
 
 #ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE
 #ifdef CONFIG_STM32F7_SDMMC1
-static int  stm32_sdmmc1_rdyinterrupt(int irq, void *context);
+static int  stm32_sdmmc1_rdyinterrupt(int irq, void *context, void *arg);
 #endif
 #ifdef CONFIG_STM32F7_SDMMC2
-static int  stm32_sdmmc2_rdyinterrupt(int irq, void *context);
+static int  stm32_sdmmc2_rdyinterrupt(int irq, void *context, void *arg);
 #endif
 #endif
 
@@ -846,14 +846,14 @@ static void stm32_configwaitints(struct stm32_dev_s *priv, uint32_t waitmask,
 
       /* Arm the SDMMC_D Ready and install Isr */
 
-      stm32_gpiosetevent(pinset, true, false, false, priv->wrchandler);
+      stm32_gpiosetevent(pinset, true, false, false, priv->wrchandler, priv);
     }
 
   /* Disarm SDMMC_D ready */
 
   if ((wkupevent & SDIOWAIT_WRCOMPLETE) != 0)
     {
-      stm32_gpiosetevent(priv->d0_gpio, false, false, false , NULL);
+      stm32_gpiosetevent(priv->d0_gpio, false, false, false , NULL, NULL);
       stm32_configgpio(priv->d0_gpio);
     }
 #endif
@@ -1506,18 +1506,18 @@ static void stm32_endtransfer(struct stm32_dev_s *priv,
 
 #ifdef CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE
 #  if defined(CONFIG_STM32F7_SDMMC1)
-static int stm32_sdmmc1_rdyinterrupt(int irq, void *context)
+static int stm32_sdmmc1_rdyinterrupt(int irq, void *context, void *arg)
 {
-  struct stm32_dev_s *priv = &g_sdmmcdev1;
+  struct stm32_dev_s *priv = (struct stm32_dev_s *)arg;
   stm32_endwait(priv, SDIOWAIT_WRCOMPLETE);
   return OK;
 }
 #  endif
 
 #  if defined(CONFIG_STM32F7_SDMMC2)
-static int stm32_sdmmc2_rdyinterrupt(int irq, void *context)
+static int stm32_sdmmc2_rdyinterrupt(int irq, void *context, void *arg)
 {
-  struct stm32_dev_s *priv = &g_sdmmcdev2;
+  struct stm32_dev_s *priv = struct stm32_dev_s *)arg;
   stm32_endwait(priv, SDIOWAIT_WRCOMPLETE);
   return OK;
 }