diff --git a/configs/stm32f4discovery/src/stm32_pmbuttons.c b/configs/stm32f4discovery/src/stm32_pmbuttons.c
index cc1ccb549e..f51c8bcada 100644
--- a/configs/stm32f4discovery/src/stm32_pmbuttons.c
+++ b/configs/stm32f4discovery/src/stm32_pmbuttons.c
@@ -41,13 +41,13 @@
 #include <arch/board/board.h>
 #include <nuttx/config.h>
 
+#include <stdbool.h>
+#include <debug.h>
+
 #include <nuttx/board.h>
 #include <nuttx/power/pm.h>
 #include <arch/irq.h>
 
-#include <stdbool.h>
-#include <debug.h>
-
 #include "up_arch.h"
 #include "nvic.h"
 #include "stm32_pwr.h"
@@ -75,10 +75,6 @@
 
 #define PM_IDLE_DOMAIN  0 /* Revisit */
 
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
 /****************************************************************************
  * Private Function Prototypes
  ****************************************************************************/
@@ -87,10 +83,6 @@
 static int button_handler(int irq, FAR void *context);
 #endif /* CONFIG_ARCH_IRQBUTTONS */
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -142,7 +134,7 @@ void stm32_pm_buttons(void)
 
       if (oldhandler != NULL)
         {
-          warn(LOG_WARNING, "WARNING: oldhandler:%p is not NULL!  "
+          warn("WARNING: oldhandler:%p is not NULL!  "
                "Button events may be lost or aliased!\n",
                oldhandler);
         }