diff --git a/drivers/usbdev/composite.c b/drivers/usbdev/composite.c
index 5671b3607b7..e3ff43a19d1 100644
--- a/drivers/usbdev/composite.c
+++ b/drivers/usbdev/composite.c
@@ -436,6 +436,7 @@ static int composite_setup(FAR struct usbdevclass_driver_s *driver,
 
   uvdbg("type=%02x req=%02x value=%04x index=%04x len=%04x\n",
         ctrl->type, ctrl->req, value, index, len);
+  UNUSED(index);
 
   if ((ctrl->type & USB_REQ_TYPE_MASK) == USB_REQ_TYPE_STANDARD)
     {
diff --git a/drivers/usbdev/usbmsc.c b/drivers/usbdev/usbmsc.c
index 05fd8e77122..941563494c6 100644
--- a/drivers/usbdev/usbmsc.c
+++ b/drivers/usbdev/usbmsc.c
@@ -1617,7 +1617,9 @@ int usbmsc_exportluns(FAR void *handle)
 {
   FAR struct usbmsc_alloc_s *alloc = (FAR struct usbmsc_alloc_s *)handle;
   FAR struct usbmsc_dev_s *priv;
+#ifndef CONFIG_USBMSC_COMPOSITE
   FAR struct usbmsc_driver_s *drvr;
+#endif
   irqstate_t flags;
   int ret = OK;
 
@@ -1630,7 +1632,9 @@ int usbmsc_exportluns(FAR void *handle)
 #endif
 
   priv = &alloc->dev;
+#ifndef CONFIG_USBMSC_COMPOSITE
   drvr = &alloc->drvr;
+#endif
 
   /* Start the worker thread
    *