diff --git a/configs/stm32butterfly2/src/stm32_mmcsd.c b/configs/stm32butterfly2/src/stm32_mmcsd.c
index 79a2c748b3c..bbb4ccc1d84 100644
--- a/configs/stm32butterfly2/src/stm32_mmcsd.c
+++ b/configs/stm32butterfly2/src/stm32_mmcsd.c
@@ -125,7 +125,7 @@ static void *stm32_cd_thread(void *arg)
  *   Card detect interrupt handler.
  ****************************************************************************/
 
-static int stm32_cd(int irq, FAR void *context)
+static int stm32_cd(int irq, void *context)
 {
   static const int debounce_time = 100; /* [ms] */
   static uint32_t now = 0;
@@ -160,8 +160,8 @@ static int stm32_cd(int irq, FAR void *context)
  *   Registers media change callback
  ****************************************************************************/
 
-int stm32_spi1register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
-                       FAR void *arg)
+int stm32_spi1register(struct spi_dev_s *dev, spi_mediachange_t callback,
+                       void *arg)
 {
   spiinfo("INFO: Registering spi1 device\n");
   g_chmediaclbk = callback;
@@ -178,7 +178,7 @@ int stm32_spi1register(FAR struct spi_dev_s *dev, spi_mediachange_t callback,
 
 int stm32_mmcsd_initialize(int minor)
 {
-  FAR struct spi_dev_s *spi;
+  struct spi_dev_s *spi;
   struct sched_param schparam;
   pthread_attr_t pattr;
   int rv;
diff --git a/configs/stm32butterfly2/src/stm32_spi.c b/configs/stm32butterfly2/src/stm32_spi.c
index 316fdee2085..64cae0c6e05 100644
--- a/configs/stm32butterfly2/src/stm32_spi.c
+++ b/configs/stm32butterfly2/src/stm32_spi.c
@@ -72,8 +72,8 @@ void stm32_spidev_initialize(void)
  *   Function asserts given devid based on select
  ****************************************************************************/
 
-void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
-                     bool select)
+void stm32_spi1select(struct spi_dev_s *dev, enum spi_dev_e devid,
+                      bool select)
 {
   spiinfo("INFO: Selecting spi dev: %d, state: %d\n", devid, select);
   if (devid == SPIDEV_MMCSD)
@@ -89,7 +89,7 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid,
  *   Return status of devid
  ****************************************************************************/
 
-uint8_t stm32_spi1status(FAR struct spi_dev_s *dev, enum spi_dev_e devid)
+uint8_t stm32_spi1status(struct spi_dev_s *dev, enum spi_dev_e devid)
 {
   spiinfo("INFO: Requesting info from spi dev: %d\n", devid);
   if (devid == SPIDEV_MMCSD)