diff --git a/include/nuttx/spi/spi.h b/include/nuttx/spi/spi.h
index 5f127287de7..e17ad6d4de3 100644
--- a/include/nuttx/spi/spi.h
+++ b/include/nuttx/spi/spi.h
@@ -360,7 +360,7 @@ enum spi_dev_e
   SPIDEV_EXPANDER,    /* Select SPI I/O expander device */
   SPIDEV_MUX,         /* Select SPI multiplexer device */
   SPIDEV_AUDIO_DATA,  /* Select SPI audio codec device data port */
-  SPIDEV_AUDIO_CTRL,  /* Select SPI audio codec device control port */
+  SPIDEV_AUDIO_CTRL   /* Select SPI audio codec device control port */
 };
 
 /* Certain SPI devices may required differnt clocking modes */
diff --git a/libc/spawn/lib_psa_dump.c b/libc/spawn/lib_psa_dump.c
index 03770c6ff8b..4687e833828 100644
--- a/libc/spawn/lib_psa_dump.c
+++ b/libc/spawn/lib_psa_dump.c
@@ -122,6 +122,6 @@ void posix_spawnattr_dump(posix_spawnattr_t *attr)
 #ifndef CONFIG_DISABLE_SIGNALS
   dbg("  sigmask:  %08x\n", attr->sigmask);
 #endif
-};
+}
 
 #endif /* CONFIG_DEBUG */
\ No newline at end of file
diff --git a/libc/stdio/lib_sscanf.c b/libc/stdio/lib_sscanf.c
index 97faa25e522..b4c7ef9fe54 100644
--- a/libc/stdio/lib_sscanf.c
+++ b/libc/stdio/lib_sscanf.c
@@ -356,6 +356,9 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
 
           else if (strchr("dobxu", *fmt))
             {
+              FAR long *plong = NULL;
+              FAR int  *pint  = NULL;
+
               lvdbg("vsscanf: Performing integer conversion\n");
 
               /* Get a pointer to the integer value.  We need to do this even
@@ -363,8 +366,6 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
                * update the 'ap' variable.
                */
 
-              FAR long *plong = NULL;
-              FAR int  *pint  = NULL;
               if (!noassign)
                 {
                   /* We have to check whether we need to return a long or an
@@ -481,6 +482,11 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
 
           else if (*fmt == 'f')
             {
+#ifdef CONFIG_HAVE_DOUBLE
+              FAR double_t *pd = NULL;
+#endif
+              FAR float    *pf = NULL;
+
               lvdbg("vsscanf: Performing floating point conversion\n");
 
               /* Get a pointer to the double value.  We need to do this even
@@ -488,10 +494,6 @@ int vsscanf(FAR const char *buf, FAR const char *fmt, va_list ap)
                * update the 'ap' variable.
                */
 
-#ifdef CONFIG_HAVE_DOUBLE
-              FAR double_t *pd = NULL;
-#endif
-              FAR float    *pf = NULL;
               if (!noassign)
                 {
                   /* We have to check whether we need to return a float or a