SAMA5: A few early, easy bug fixes. The rest will all be difficult

arch/arm/src/sama5/sam_hsmci.c

@@ -494,10 +494,10 @@ static void sam_callback(void *arg);
  * Private Data
  ****************************************************************************/
 
-struct sam_dev_s g_sdiodev =
+/* Callbacks */
+
+static const struct sdio_dev_s g_callbacks =
 {
-  .dev =
-  {
   .reset            = sam_reset,
   .status           = sam_status,
   .widebus          = sam_widebus,
@@ -525,7 +525,6 @@ struct sam_dev_s g_sdiodev =
   .dmarecvsetup     = sam_dmarecvsetup,
   .dmasendsetup     = sam_dmasendsetup,
 #endif
-  },
 };
 
 /* Pre-allocate memory for each HSMCI device */
@@ -2809,12 +2808,19 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
       return NULL;
     }
 
+  fvdbg("priv: %p base: %08x hsmci: %d dmac: %d pid: %d\n",
+        priv, priv->base, priv->hsmci, dmac, pid);
+
   /* Initialize the HSMCI slot structure */
 
   sem_init(&priv->waitsem, 0, 0);
   priv->waitwdog = wd_create();
   DEBUGASSERT(priv->waitwdog);
 
+  /* Initialize the callbacks */
+
+  memcpy(&priv->dev, &g_callbacks, sizeof(struct sdio_dev_s ));
+
   /* Allocate a DMA channel */
 
   priv->dma = sam_dmachannel(dmac, DMA_FLAGS(pid));
@@ -2825,7 +2831,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
    */
 
   sam_reset(&priv->dev);
-  return &g_sdiodev.dev;
+  return &priv->dev;
 }
 
 /****************************************************************************