file_operations: get back C89 compatible initializer

Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>

arch/arm/src/cxd56xx/cxd56_adc.c

@@ -202,11 +202,12 @@ static const struct file_operations g_adcops =
   cxd56_adc_open,            /* open */
   cxd56_adc_close,           /* close */
   cxd56_adc_read,            /* read */
-  0,                         /* write */
+  NULL,                      /* write */
-  0,                         /* seek */
+  NULL,                      /* seek */
   cxd56_adc_ioctl,           /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL                       /* poll */
-  0,                         /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                     /* unlink */
 #endif
 };
 

arch/arm/src/cxd56xx/cxd56_charger.c

@@ -96,11 +96,9 @@ static const struct file_operations g_chargerops =
   charger_close,  /* close */
   charger_read,   /* read */
   charger_write,  /* write */
-  0,              /* seek */
+  NULL,           /* seek */
-  charger_ioctl   /* ioctl */
+  charger_ioctl,  /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL            /* poll */
-  , NULL          /* poll */
-#endif
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
   , NULL          /* unlink */
 #endif

arch/arm/src/cxd56xx/cxd56_gauge.c

@@ -81,11 +81,9 @@ static const struct file_operations g_gaugeops =
   gauge_close,  /* close */
   gauge_read,   /* read */
   gauge_write,  /* write */
-  0,            /* seek */
+  NULL,         /* seek */
-  gauge_ioctl   /* ioctl */
+  gauge_ioctl,  /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL          /* poll */
-  , NULL        /* poll */
-#endif
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
   , NULL        /* unlink */
 #endif

arch/arm/src/cxd56xx/cxd56_geofence.c

@@ -76,11 +76,9 @@ static ssize_t cxd56_geofence_read(FAR struct file *filep,
 static int cxd56_geofence_ioctl(FAR struct file *filep,
                                 int cmd,
                                 unsigned long arg);
-#ifndef CONFIG_DISABLE_POLL
 static int cxd56_geofence_poll(FAR struct file *filep,
                                FAR struct pollfd *fds,
                                bool setup);
-#endif
 
 /* ioctl command functions */
 
@@ -106,11 +104,12 @@ static const struct file_operations g_geofencefops =
   cxd56_geofence_open,  /* open */
   cxd56_geofence_close, /* close */
   cxd56_geofence_read,  /* read */
-  0,                    /* write */
+  NULL,                 /* write */
-  0,                    /* seek */
+  NULL,                 /* seek */
   cxd56_geofence_ioctl, /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  cxd56_geofence_poll   /* poll */
-  cxd56_geofence_poll,  /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                /* unlink */
 #endif
 };
 
@@ -607,7 +606,6 @@ static int cxd56_geofence_ioctl(FAR struct file *filep, int cmd,
  *
  ****************************************************************************/
 
-#ifndef CONFIG_DISABLE_POLL
 static int cxd56_geofence_poll(FAR struct file *filep,
                                FAR struct pollfd *fds,
                                bool setup)
@@ -674,7 +672,6 @@ errout:
   nxsem_post(&priv->devsem);
   return ret;
 }
-#endif
 
 /****************************************************************************
  * Name: cxd56_geofence_register

arch/arm/src/cxd56xx/cxd56_gnss.c

@@ -293,10 +293,8 @@ static ssize_t cxd56_gnss_write(FAR struct file *filep,
                                 FAR const char *buffer, size_t buflen);
 static int cxd56_gnss_ioctl(FAR struct file *filep, int cmd,
                             unsigned long arg);
-#ifndef CONFIG_DISABLE_POLL
 static int cxd56_gnss_poll(FAR struct file *filep, FAR struct pollfd *fds,
                            bool setup);
-#endif
 static int8_t cxd56_gnss_select_notifytype(off_t fpos, uint32_t *offset);
 
 static int cxd56_gnss_cpufifo_api(FAR struct file *filep,
@@ -315,10 +313,11 @@ static const struct file_operations g_gnssfops =
   cxd56_gnss_close, /* close */
   cxd56_gnss_read,  /* read */
   cxd56_gnss_write, /* write */
-  0,                /* seek */
+  NULL,             /* seek */
   cxd56_gnss_ioctl, /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  cxd56_gnss_poll   /* poll */
-  cxd56_gnss_poll,  /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL            /* unlink */
 #endif
 };
 
@@ -2899,7 +2898,6 @@ static int cxd56_gnss_ioctl(FAR struct file *filep, int cmd,
  *
  ****************************************************************************/
 
-#ifndef CONFIG_DISABLE_POLL
 static int cxd56_gnss_poll(FAR struct file *filep, FAR struct pollfd *fds,
                            bool setup)
 {
@@ -2965,7 +2963,6 @@ errout:
   nxsem_post(&priv->devsem);
   return ret;
 }
-#endif
 
 /****************************************************************************
  * Name: cxd56_gnss_register

arch/x86_64/src/intel64/intel64_rng.c

@@ -66,17 +66,15 @@ static struct rng_dev_s g_rngdev;
 
 static const struct file_operations g_rngops =
 {
-  0,               /* open */
+  NULL,            /* open */
-  0,               /* close */
+  NULL,            /* close */
   x86_rngread,     /* read */
-  0,               /* write */
+  NULL,            /* write */
-  0,               /* seek */
+  NULL,            /* seek */
-  0                /* ioctl */
+  NULL,            /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL             /* poll */
-  , 0              /* poll */
-#endif
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , 0              /* unlink */
+  , NULL           /* unlink */
 #endif
 };
 

audio/audio.c

@@ -122,6 +122,9 @@ static const struct file_operations g_audioops =
   NULL,        /* seek */
   audio_ioctl, /* ioctl */
   NULL         /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL       /* unlink */
+#endif
 };
 
 /****************************************************************************

boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c

@@ -171,12 +171,12 @@ static const struct file_operations g_ak09912fops =
   ak09912_close,                 /* close */
   ak09912_read,                  /* read */
   ak09912_write,                 /* write */
-  0,                             /* seek */
+  NULL,                          /* seek */
   ak09912_ioctl,                 /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL                           /* poll */
-  0,                             /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                         /* unlink */
 #endif
-  0                              /* unlink */
 };
 
 /* Take XYZ data, temperature and Status 2 register.

boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c

@@ -181,12 +181,12 @@ static const struct file_operations g_apds9930alsfops =
   apds9930_close_als,          /* close */
   apds9930_read_als,           /* read */
   apds9930_write,              /* write */
-  0,                           /* seek */
+  NULL,                        /* seek */
   apds9930_ioctl_als,          /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL                         /* poll */
-  0,                           /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                       /* unlink */
 #endif
-  0                            /* unlink */
 };
 
 /* Proximity sensor */
@@ -197,12 +197,12 @@ static const struct file_operations g_apds9930psfops =
   apds9930_close_ps,           /* close */
   apds9930_read_ps,            /* read */
   apds9930_write,              /* write */
-  0,                           /* seek */
+  NULL,                        /* seek */
   apds9930_ioctl_ps,           /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL                         /* poll */
-  0,                           /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                       /* unlink */
 #endif
-  0                            /* unlink */
 };
 
 /* SCU instructions for pick ambient light sensing data. */

boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c

@@ -103,12 +103,12 @@ static const struct file_operations g_bh1721fvcfops =
   bh1721fvc_close,             /* close */
   bh1721fvc_read,              /* read */
   bh1721fvc_write,             /* write */
-  0,                           /* seek */
+  NULL,                        /* seek */
   bh1721fvc_ioctl,             /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL                         /* poll */
-  0,                           /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                       /* unlink */
 #endif
-  0                            /* unlink */
 };
 
 /* Take ambient light data. */

boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c

@@ -126,12 +126,12 @@ static const struct file_operations g_bh1745nucfops =
   bh1745nuc_close,             /* close */
   bh1745nuc_read,              /* read */
   bh1745nuc_write,             /* write */
-  0,                           /* seek */
+  NULL,                        /* seek */
   bh1745nuc_ioctl,             /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL                         /* poll */
-  0,                           /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                       /* unlink */
 #endif
-  0                            /* unlink */
 };
 
 /* Take color data. */

boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c

@@ -125,12 +125,12 @@ static const struct file_operations g_bm1383glvfops =
   bm1383glv_close,             /* close */
   bm1383glv_read,              /* read */
   bm1383glv_write,             /* write */
-  0,                           /* seek */
+  NULL,                        /* seek */
   bm1383glv_ioctl,             /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL                         /* poll */
-  0,                           /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                       /* unlink */
 #endif
-  0                            /* unlink */
 };
 
 /* Device is not BM1383AGLV but BM1383GLV */

boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c

@@ -139,12 +139,12 @@ static const struct file_operations g_bm1422gmvfops =
   bm1422gmv_close,             /* close */
   bm1422gmv_read,              /* read */
   bm1422gmv_write,             /* write */
-  0,                           /* seek */
+  NULL,                        /* seek */
   bm1422gmv_ioctl,             /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL                         /* poll */
-  0,                           /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                       /* unlink */
 #endif
-  0                            /* unlink */
 };
 
 /* Take XYZ data. */

boards/arm/cxd56xx/drivers/sensors/kx022_scu.c

@@ -130,12 +130,12 @@ static const struct file_operations g_kx022fops =
   kx022_close,                 /* close */
   kx022_read,                  /* read */
   kx022_write,                 /* write */
-  0,                           /* seek */
+  NULL,                        /* seek */
   kx022_ioctl,                 /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL                         /* poll */
-  0,                           /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                       /* unlink */
 #endif
-  0                            /* unlink */
 };
 
 /* Take XYZ data. */

boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c

@@ -176,12 +176,12 @@ static const struct file_operations g_lt1pa01alsfops =
   lt1pa01_close_als,           /* close */
   lt1pa01_read_als,            /* read */
   lt1pa01_write,               /* write */
-  0,                           /* seek */
+  NULL,                        /* seek */
   lt1pa01_ioctl_als,           /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL                         /* poll */
-  0,                           /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                       /* unlink */
 #endif
-  0                            /* unlink */
 };
 
 /* Proximity sensor */
@@ -192,12 +192,12 @@ static const struct file_operations g_lt1pa01proxfops =
   lt1pa01_close_prox,          /* close */
   lt1pa01_read_prox,           /* read */
   lt1pa01_write,               /* write */
-  0,                           /* seek */
+  NULL,                        /* seek */
   lt1pa01_ioctl_prox,          /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL                         /* poll */
-  0,                           /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                       /* unlink */
 #endif
-  0                            /* unlink */
 };
 
 /* SCU instructions for pick ambient light sensing data. */

boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c

@@ -164,12 +164,12 @@ static const struct file_operations g_rpr0521rsalsfops =
   rpr0521rs_close_als,         /* close */
   rpr0521rs_read_als,          /* read */
   rpr0521rs_write,             /* write */
-  0,                           /* seek */
+  NULL,                        /* seek */
   rpr0521rs_ioctl_als,         /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL                         /* poll */
-  0,                           /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                       /* unlink */
 #endif
-  0                            /* unlink */
 };
 
 /* Proximity sensor */
@@ -180,12 +180,12 @@ static const struct file_operations g_rpr0521rspsfops =
   rpr0521rs_close_ps,          /* close */
   rpr0521rs_read_ps,           /* read */
   rpr0521rs_write,             /* write */
-  0,                           /* seek */
+  NULL,                        /* seek */
   rpr0521rs_ioctl_ps,          /* ioctl */
-#ifndef CONFIG_DISABLE_POLL
+  NULL                         /* poll */
-  0,                           /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                       /* unlink */
 #endif
-  0                            /* unlink */
 };
 
 /* SCU instructions for pick ambient light sensing data. */

drivers/analog/adc.c

@@ -91,8 +91,8 @@ static const struct file_operations g_adc_fops =
   adc_open,     /* open */
   adc_close,    /* close */
   adc_read,     /* read */
-  0,            /* write */
+  NULL,         /* write */
-  0,            /* seek */
+  NULL,         /* seek */
   adc_ioctl,    /* ioctl */
   adc_poll      /* poll */
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS

drivers/analog/ads1242.c

@@ -101,13 +101,16 @@ static int     ads1242_ioctl(FAR struct file *filep, int cmd,
 
 static const struct file_operations g_ads1242_fops =
 {
-  ads1242_open,
+  ads1242_open,   /* open */
-  ads1242_close,
+  ads1242_close,  /* close */
-  ads1242_read,
+  ads1242_read,   /* read */
-  ads1242_write,
+  ads1242_write,  /* write */
-  NULL,
+  NULL,           /* seek */
-  ads1242_ioctl,
+  ads1242_ioctl,  /* ioctl */
-  NULL
+  NULL            /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL          /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/analog/dac.c

@@ -86,13 +86,16 @@ static int     dac_ioctl(FAR struct file *filep, int cmd, unsigned long arg);
 
 static const struct file_operations dac_fops =
 {
-  dac_open,
+  dac_open,       /* open */
-  dac_close,
+  dac_close,      /* close */
-  dac_read,
+  dac_read,       /* read */
-  dac_write,
+  dac_write,      /* write */
-  NULL,
+  NULL,           /* seek */
-  dac_ioctl,
+  dac_ioctl,      /* ioctl */
-  NULL
+  NULL            /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL          /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/contactless/mfrc522.c

@@ -108,15 +108,15 @@ static inline int mfrc522_attachirq(FAR struct mfrc522_dev_s *dev,
 
 static const struct file_operations g_mfrc522fops =
 {
-  mfrc522_open,
+  mfrc522_open,   /* open */
-  mfrc522_close,
+  mfrc522_close,  /* close */
-  mfrc522_read,
+  mfrc522_read,   /* read */
-  mfrc522_write,
+  mfrc522_write,  /* write */
-  NULL,
+  NULL,           /* seek */
-  mfrc522_ioctl,
+  mfrc522_ioctl,  /* ioctl */
-  NULL
+  NULL            /* poll */
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL
+  , NULL          /* unlink */
 #endif
 };
 

drivers/contactless/pn532.c

@@ -104,15 +104,15 @@ static inline int pn532_attachirq(FAR struct pn532_dev_s *dev, xcpt_t isr);
 
 static const struct file_operations g_pn532fops =
 {
-  _open,
+  _open,          /* open */
-  _close,
+  _close,         /* close */
-  _read,
+  _read,          /* read */
-  _write,
+  _write,         /* write */
-  NULL,
+  NULL,           /* seek */
-  _ioctl,
+  _ioctl,         /* ioctl */
-  NULL
+  NULL            /* poll */
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL
+  , NULL          /* unlink */
 #endif
 };
 

drivers/eeprom/i2c_xx24xx.c

@@ -239,6 +239,9 @@ static const struct file_operations ee24xx_fops =
   ee24xx_seek,  /* seek */
   ee24xx_ioctl, /* ioctl */
   NULL          /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL        /* unlink */
+#endif
 };
 
 #ifdef CONFIG_AT24CS_UUID
@@ -251,6 +254,9 @@ static const struct file_operations at24cs_uuid_fops =
   NULL,             /* seek */
   NULL,             /* ioctl */
   NULL              /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL            /* unlink */
+#endif
 };
 #endif
 

drivers/eeprom/spi_xx25xx.c

@@ -276,6 +276,9 @@ static const struct file_operations ee25xx_fops =
   ee25xx_seek,  /* seek */
   ee25xx_ioctl, /* ioctl */
   NULL          /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL        /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/efuse/efuse.c

@@ -88,6 +88,9 @@ static const struct file_operations g_efuseops =
   NULL,        /* seek */
   efuse_ioctl, /* ioctl */
   NULL         /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL       /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/i2s/i2schar.c

@@ -111,7 +111,10 @@ static const struct file_operations i2schar_fops =
   i2schar_write,        /* write */
   NULL,                 /* seek  */
   i2schar_ioctl,        /* ioctl */
-  NULL,                 /* poll  */
+  NULL                  /* poll  */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/input/ads7843e.c

@@ -119,10 +119,13 @@ static const struct file_operations ads7843e_fops =
   ads7843e_open,    /* open */
   ads7843e_close,   /* close */
   ads7843e_read,    /* read */
-  0,                /* write */
+  NULL,             /* write */
-  0,                /* seek */
+  NULL,             /* seek */
   ads7843e_ioctl,   /* ioctl */
   ads7843e_poll     /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL            /* unlink */
+#endif
 };
 
 /* If only a single ADS7843E device is supported, then the driver state

drivers/input/ajoystick.c

@@ -142,10 +142,13 @@ static const struct file_operations ajoy_fops =
   ajoy_open,  /* open */
   ajoy_close, /* close */
   ajoy_read,  /* read */
-  0,          /* write */
+  NULL,       /* write */
-  0,          /* seek */
+  NULL,       /* seek */
   ajoy_ioctl, /* ioctl */
   ajoy_poll   /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL      /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/input/button_upper.c

@@ -142,6 +142,9 @@ static const struct file_operations btn_fops =
   NULL,      /* seek */
   btn_ioctl, /* ioctl */
   btn_poll   /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL     /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/input/cypress_mbr3108.c

@@ -225,6 +225,9 @@ static const struct file_operations g_mbr3108_fileops =
   NULL,           /* seek */
   NULL,           /* ioctl */
   mbr3108_poll    /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL          /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/input/djoystick.c

@@ -142,10 +142,13 @@ static const struct file_operations djoy_fops =
   djoy_open,  /* open */
   djoy_close, /* close */
   djoy_read,  /* read */
-  0,          /* write */
+  NULL,       /* write */
-  0,          /* seek */
+  NULL,       /* seek */
   djoy_ioctl, /* ioctl */
   djoy_poll   /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL      /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/input/max11802.c

@@ -112,12 +112,12 @@ static const struct file_operations max11802_fops =
   max11802_open,    /* open */
   max11802_close,   /* close */
   max11802_read,    /* read */
-  0,                /* write */
+  NULL,             /* write */
-  0,                /* seek */
+  NULL,             /* seek */
   max11802_ioctl,   /* ioctl */
   max11802_poll     /* poll */
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , 0               /* unlink */
+  , NULL            /* unlink */
 #endif
 };
 

drivers/input/mxt.c

@@ -276,10 +276,13 @@ static const struct file_operations mxt_fops =
   mxt_open,    /* open */
   mxt_close,   /* close */
   mxt_read,    /* read */
-  0,           /* write */
+  NULL,        /* write */
-  0,           /* seek */
+  NULL,        /* seek */
   mxt_ioctl,   /* ioctl */
   mxt_poll     /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL       /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/input/spq10kbd.c

@@ -248,13 +248,16 @@ static int  spq10kbd_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
 static const struct file_operations g_hidkbd_fops =
 {
-  spq10kbd_open,             /* open      */
+  spq10kbd_open,             /* open */
-  spq10kbd_close,            /* close     */
+  spq10kbd_close,            /* close */
-  spq10kbd_read,             /* read      */
+  spq10kbd_read,             /* read */
-  spq10kbd_write,            /* write     */
+  spq10kbd_write,            /* write */
-  NULL,                      /* seek      */
+  NULL,                      /* seek */
-  NULL,                      /* ioctl     */
+  NULL,                      /* ioctl */
-  spq10kbd_poll              /* poll      */
+  spq10kbd_poll              /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                     /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/input/stmpe811_tsc.c

@@ -125,6 +125,9 @@ static const struct file_operations g_stmpe811fops =
   NULL,             /* seek */
   stmpe811_ioctl,   /* ioctl */
   stmpe811_poll     /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL            /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/input/touchscreen_upper.c

@@ -87,13 +87,16 @@ static int     touch_poll(FAR struct file *filep, FAR struct pollfd *fds,
 
 static const struct file_operations g_touch_fops =
 {
-  touch_open,
+  touch_open,     /* open */
-  touch_close,
+  touch_close,    /* close */
-  touch_read,
+  touch_read,     /* read */
-  NULL,
+  NULL,           /* write */
-  NULL,
+  NULL,           /* seek */
-  touch_ioctl,
+  touch_ioctl,    /* ioctl */
-  touch_poll
+  touch_poll      /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL          /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/input/tsc2007.c

@@ -205,10 +205,13 @@ static const struct file_operations tsc2007_fops =
   tsc2007_open,    /* open */
   tsc2007_close,   /* close */
   tsc2007_read,    /* read */
-  0,               /* write */
+  NULL,            /* write */
-  0,               /* seek */
+  NULL,            /* seek */
   tsc2007_ioctl,   /* ioctl */
   tsc2007_poll     /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL           /* unlink */
+#endif
 };
 
 /* If only a single TSC2007 device is supported, then the driver state

drivers/lcd/ht16k33_14seg.c

@@ -160,9 +160,9 @@ static const struct file_operations g_ht16k33fops =
   ht16k33_write,  /* write */
   ht16k33_seek,   /* seek */
   ht16k33_ioctl,  /* ioctl */
-  NULL,           /* poll */
+  NULL            /* poll */
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  NULL            /* unlink */
+  , NULL          /* unlink */
 #endif
 };
 

drivers/lcd/pcf8574_lcd_backpack.c

@@ -123,9 +123,9 @@ static const struct file_operations g_pcf8574_lcd_fops =
   pcf8574_lcd_write,            /* write */
   pcf8574_lcd_seek,             /* seek */
   pcf8574_lcd_ioctl,            /* ioctl */
-  pcf8574lcd_poll,              /* poll */
+  pcf8574lcd_poll               /* poll */
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  pcf8574_lcd_unlink            /* unlink */
+  , pcf8574_lcd_unlink          /* unlink */
 #endif
 };
 

drivers/lcd/st7032.c

@@ -116,9 +116,9 @@ static const struct file_operations g_st7032fops =
   st7032_write,  /* write */
   st7032_seek,   /* seek */
   st7032_ioctl,  /* ioctl */
-  NULL,          /* poll */
+  NULL           /* poll */
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  NULL           /* unlink */
+  , NULL         /* unlink */
 #endif
 };
 

drivers/leds/max7219.c

@@ -89,9 +89,9 @@ static const struct file_operations g_max7219fops =
   max7219_write,  /* write */
   NULL,           /* seek */
   NULL,           /* ioctl */
-  NULL,           /* poll */
+  NULL            /* poll */
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  NULL            /* unlink */
+  , NULL          /* unlink */
 #endif
 };
 

drivers/leds/ncp5623c.c

@@ -86,9 +86,12 @@ static const struct file_operations g_ncp5623c_fileops =
   ncp5623c_close,              /* close */
   ncp5623c_read,               /* read */
   ncp5623c_write,              /* write */
-  0,                           /* seek */
+  NULL,                        /* seek */
   ncp5623c_ioctl,              /* ioctl */
-  0                            /* poll */
+  NULL                         /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                      /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/leds/pca9635pw.c

@@ -68,11 +68,14 @@ static const struct file_operations g_pca9635pw_fileops =
 {
   pca9635pw_open,               /* open */
   pca9635pw_close,              /* close */
-  0,                            /* read */
+  NULL,                         /* read */
-  0,                            /* write */
+  NULL,                         /* write */
-  0,                            /* seek */
+  NULL,                         /* seek */
   pca9635pw_ioctl,              /* ioctl */
-  0                             /* poll */
+  NULL                          /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                        /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/leds/ws2812.c

@@ -131,9 +131,9 @@ static const struct file_operations g_ws2812fops =
   ws2812_write,   /* write */
   ws2812_seek,    /* seek */
   NULL,           /* ioctl */
-  NULL,           /* poll */
+  NULL            /* poll */
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  NULL            /* unlink */
+  , NULL          /* unlink */
 #endif
 };
 

drivers/loop/loop.c

@@ -58,6 +58,9 @@ static const struct file_operations g_loop_fops =
   NULL,          /* seek */
   loop_ioctl,    /* ioctl */
   NULL           /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL         /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/lwl_console.c

@@ -139,8 +139,7 @@ static const struct file_operations g_consoleops =
   lwlconsole_ioctl,           /* ioctl */
   NULL                        /* poll */
 #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-    ,
+  , NULL                      /* unlink */
-  NULL                        /* unlink */
 #endif
 };
 

drivers/math/cordic.c

@@ -82,6 +82,9 @@ static const struct file_operations g_cordicops =
   NULL,         /* seek */
   cordic_ioctl, /* ioctl */
   NULL          /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL        /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/modem/altair/altmdm.c

@@ -62,8 +62,12 @@ static const struct file_operations g_altmdmfops =
   altmdm_close,                 /* close */
   altmdm_read,                  /* read */
   altmdm_write,                 /* write */
-  0,                            /* seek */
+  NULL,                         /* seek */
   altmdm_ioctl,                 /* ioctl */
+  NULL                          /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL                        /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/modem/u-blox.c

@@ -108,13 +108,16 @@ static int     ubxmdm_poll (FAR struct file * filep,
 
 static const struct file_operations ubxmdm_fops =
 {
-  0,            /* open */
+  NULL,         /* open */
-  0,            /* close */
+  NULL,         /* close */
   ubxmdm_read,  /* read */
   ubxmdm_write, /* write */
-  0,            /* seek */
+  NULL,         /* seek */
   ubxmdm_ioctl, /* ioctl */
   ubxmdm_poll   /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL        /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/mtd/mtd_config.c

@@ -119,10 +119,13 @@ static const struct file_operations mtdconfig_fops =
   mtdconfig_open,  /* open */
   mtdconfig_close, /* close */
   mtdconfig_read,  /* read */
-  0,               /* write */
+  NULL,            /* write */
-  0,               /* seek */
+  NULL,            /* seek */
   mtdconfig_ioctl, /* ioctl */
   mtdconfig_poll   /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL            /* unlink */
+#endif
 };
 
 /****************************************************************************

drivers/mtd/smart.c

@@ -462,6 +462,9 @@ static const struct file_operations g_fops =
   NULL,             /* seek */
   smart_loop_ioctl, /* ioctl */
   NULL              /* poll */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
+  , NULL            /* unlink */
+#endif
 };
 #endif /* CONFIG_SMART_DEV_LOOP */
 
@@ -2676,7 +2679,9 @@ err_out:
 static void smart_erase_block_if_empty(FAR struct smart_struct_s *dev,
         uint16_t block, uint8_t forceerase)
 {
-  uint16_t  freecount, releasecount, prerelease;
+  uint16_t freecount;
+  uint16_t releasecount;
+  uint16_t prerelease;
 
 #ifdef CONFIG_MTD_SMART_PACK_COUNTS
   releasecount = smart_get_count(dev, dev->releasecount, block);
@@ -2771,10 +2776,15 @@ static void smart_erase_block_if_empty(FAR struct smart_struct_s *dev,
 static int smart_relocate_static_data(FAR struct smart_struct_s *dev,
                                       uint16_t block)
 {
-  uint16_t    freecount, x, sector, minblock;
+  uint16_t freecount;
-  uint16_t    nextsector, newsector, mincount;
+  uint16_t x;
-  int         ret;
+  uint16_t sector;
-  FAR struct  smart_sect_header_s *header;
+  uint16_t minblock;
+  uint16_t nextsector;
+  uint16_t newsector;
+  uint16_t mincount;
+  int ret;
+  FAR struct smart_sect_header_s *header;
 #ifdef CONFIG_MTD_SMART_ENABLE_CRC
   FAR struct smart_allocsector_s *allocsector;
 #endif
@@ -3012,7 +3022,7 @@ errout:
 #ifdef CONFIG_MTD_SMART_ENABLE_CRC
 static crc_t smart_calc_sector_crc(FAR struct smart_struct_s *dev)
 {
-  crc_t     crc = 0;
+  crc_t crc = 0;
 
 #ifdef CONFIG_SMART_CRC_8
 
@@ -3085,12 +3095,13 @@ static crc_t smart_calc_sector_crc(FAR struct smart_struct_s *dev)
 static inline int smart_llformat(FAR struct smart_struct_s *dev,
                                  unsigned long arg)
 {
-  FAR struct  smart_sect_header_s  *sectorheader;
+  FAR struct smart_sect_header_s *sectorheader;
-  size_t      wrcount;
+  size_t wrcount;
-  int         x;
+  int x;
-  int         ret;
+  int ret;
-  uint8_t     sectsize, prerelease;
+  uint8_t sectsize;
-  uint16_t    sectorsize;
+  uint8_t prerelease;
+  uint16_t sectorsize;
 
   finfo("Entry\n");
 
@@ -3305,12 +3316,12 @@ static inline int smart_llformat(FAR struct smart_struct_s *dev,
  ****************************************************************************/
 
 static int smart_relocate_sector(FAR struct smart_struct_s *dev,
-    uint16_t oldsector, uint16_t newsector)
+                                 uint16_t oldsector, uint16_t newsector)
 {
-  size_t      offset;
+  size_t offset;
-  FAR struct  smart_sect_header_s *header;
+  FAR struct smart_sect_header_s *header;
-  uint8_t     newstatus;
+  uint8_t newstatus;
-  int         ret;
+  int ret;
 
   header = (FAR struct smart_sect_header_s *) dev->rwbuffer;
 
@@ -3445,14 +3456,15 @@ errout:
 static int smart_relocate_block(FAR struct smart_struct_s *dev,
                                 uint16_t block)
 {
-  uint16_t    newsector, oldrelease;
+  uint16_t newsector;
-  int         x;
+  uint16_t oldrelease;
-  int         ret;
+  int x;
-  FAR struct  smart_sect_header_s *header;
+  int ret;
-  uint8_t     prerelease;
+  FAR struct smart_sect_header_s *header;
-  uint16_t    freecount;
+  uint8_t prerelease;
+  uint16_t freecount;
 #if defined(CONFIG_SMART_LOCAL_CHECKFREE) && defined(CONFIG_DEBUG_FS)
-  uint16_t    releasecount;
+  uint16_t releasecount;
 #endif
 #ifdef CONFIG_MTD_SMART_ENABLE_CRC
   FAR struct smart_allocsector_s *allocsector;
@@ -3704,18 +3716,22 @@ errout:
 static int smart_findfreephyssector(FAR struct smart_struct_s *dev,
     uint8_t canrelocate)
 {
-  uint16_t  count, allocfreecount, allocblock;
+  uint16_t count;
+  uint16_t allocfreecount;
+  uint16_t allocblock;
 #ifdef CONFIG_MTD_SMART_WEAR_LEVEL
-  uint16_t  wornfreecount, wornblock;
+  uint16_t wornfreecount;
-  uint8_t   wearlevel, wornlevel;
+  uint16_t wornblock;
-  uint8_t   maxwearlevel;
+  uint8_t wearlevel;
+  uint8_t wornlevel;
+  uint8_t maxwearlevel;
 #endif
-  uint16_t  physicalsector;
+  uint16_t physicalsector;
-  uint16_t  block;
+  uint16_t block;
-  uint32_t  readaddr;
+  uint32_t readaddr;
-  struct    smart_sect_header_s header;
+  struct smart_sect_header_s header;
-  int       ret;
+  int ret;
-  uint16_t  i;
+  uint16_t i;
 
   /* Determine which erase block we should allocate the new
    * sector from. This is based on the number of free sectors
@@ -3982,13 +3998,13 @@ retry:
 
 static int smart_garbagecollect(FAR struct smart_struct_s *dev)
 {
-  uint16_t  collectblock;
+  uint16_t collectblock;
-  uint16_t  releasemax;
+  uint16_t releasemax;
-  bool      collect = TRUE;
+  bool collect = TRUE;
-  int       x;
+  int x;
-  int       ret;
+  int ret;
 #ifdef CONFIG_MTD_SMART_PACK_COUNTS
-  uint8_t   count;
+  uint8_t count;
 #endif
 
   while (collect)
@@ -4115,11 +4131,13 @@ errout:
 #ifdef CONFIG_MTD_SMART_WEAR_LEVEL
 static int smart_write_wearstatus(struct smart_struct_s *dev)
 {
-  uint16_t  sector;
+  uint16_t sector;
-  uint16_t  remaining, towrite;
+  uint16_t remaining;
+  uint16_t towrite;
   struct smart_read_write_s req;
-  int       ret;
+  int ret;
-  uint8_t   buffer[8], write_buffer = 0;
+  uint8_t buffer[8];
+  uint8_t write_buffer = 0;
 
   sector = 0;
   remaining = dev->geo.neraseblocks >> 1;
@@ -4235,8 +4253,10 @@ errout:
 static inline int smart_read_wearstatus(FAR struct smart_struct_s *dev)
 {
   struct smart_read_write_s req;
-  uint16_t sector, physsector;
+  uint16_t sector;
-  uint16_t remaining, toread;
+  uint16_t physsector;
+  uint16_t remaining;
+  uint16_t toread;
   uint8_t buffer[8];
   int ret;
 
@@ -4385,9 +4405,9 @@ errout:
 static int smart_write_alloc_sector(FAR struct smart_struct_s *dev,
                     uint16_t logical, uint16_t physical)
 {
-  int       ret = 1;
+  int ret = 1;
-  uint8_t   sectsize;
+  uint8_t sectsize;
-  FAR struct smart_sect_header_s  *header;
+  FAR struct smart_sect_header_s *header;
 
   memset(dev->rwbuffer, CONFIG_SMARTFS_ERASEDSTATE, dev->sectorsize);
   header = (FAR struct smart_sect_header_s *) dev->rwbuffer;
@@ -4464,8 +4484,8 @@ static int smart_write_alloc_sector(FAR struct smart_struct_s *dev,
 #ifdef CONFIG_MTD_SMART_ENABLE_CRC
 static int smart_validate_crc(FAR struct smart_struct_s *dev)
 {
-  crc_t       crc;
+  crc_t crc;
-  FAR struct  smart_sect_header_s *header;
+  FAR struct smart_sect_header_s *header;
 
   /* Calculate CRC on data region of the sector */
 
@@ -4519,19 +4539,21 @@ static int smart_validate_crc(FAR struct smart_struct_s *dev)
 static int smart_writesector(FAR struct smart_struct_s *dev,
                     unsigned long arg)
 {
-  int         ret;
+  int ret;
-  bool        needsrelocate = FALSE;
+  bool needsrelocate = FALSE;
-  uint32_t    mtdblock;
+  uint32_t mtdblock;
-  uint16_t    physsector, oldphyssector, block;
+  uint16_t physsector;
-  FAR struct  smart_read_write_s *req;
+  uint16_t oldphyssector;
-  FAR struct  smart_sect_header_s *header;
+  uint16_t block;
-  size_t      offset;
+  FAR struct smart_read_write_s *req;
-  uint8_t     byte;
+  FAR struct smart_sect_header_s *header;
+  size_t offset;
+  uint8_t byte;
 #if defined(CONFIG_MTD_SMART_WEAR_LEVEL) || !defined(CONFIG_MTD_SMART_ENABLE_CRC)
-  uint16_t    x;
+  uint16_t x;
 #endif
 #ifdef CONFIG_MTD_SMART_ENABLE_CRC
-  FAR struct  smart_allocsector_s *allocsector;
+  FAR struct smart_allocsector_s *allocsector;
 #endif
 
   finfo("Entry\n");
@@ -4932,15 +4954,15 @@ errout:
 static int smart_readsector(FAR struct smart_struct_s *dev,
                     unsigned long arg)
 {
-  int       ret;
+  int ret;
-  uint16_t  physsector;
+  uint16_t physsector;
   FAR struct smart_read_write_s *req;
 #ifdef CONFIG_MTD_SMART_ENABLE_CRC
 #if SMART_STATUS_VERSION == 1
   FAR struct smart_sect_header_s *header;
 #endif
 #else
-  uint32_t  readaddr;
+  uint32_t readaddr;
   struct smart_sect_header_s header;
 #endif
 
@@ -5085,12 +5107,12 @@ errout:
 static inline int smart_allocsector(FAR struct smart_struct_s *dev,
                     unsigned long requested)
 {
-  uint16_t  logsector = 0xffff; /* Logical sector number selected */
+  uint16_t logsector = 0xffff; /* Logical sector number selected */
-  uint16_t  physicalsector;     /* The selected physical sector */
+  uint16_t physicalsector;     /* The selected physical sector */
 #ifndef CONFIG_MTD_SMART_ENABLE_CRC
-  int       ret;
+  int ret;
 #endif
-  int       x;
+  int x;
 
   /* Validate that we have enough sectors available to perform an
    * allocation.  We have to ensure we keep enough reserved sectors
@@ -5334,12 +5356,12 @@ static inline int smart_allocsector(FAR struct smart_struct_s *dev,
 static inline int smart_freesector(FAR struct smart_struct_s *dev,
                     unsigned long logicalsector)
 {
-  int       ret;
+  int ret;
-  int       readaddr;
+  int readaddr;
-  uint16_t  physsector;
+  uint16_t physsector;
-  uint16_t  block;
+  uint16_t block;
-  struct    smart_sect_header_s  header;
+  struct smart_sect_header_s header;
-  size_t    offset;
+  size_t offset;
 
   /* Check if the logical sector is within bounds */
 
@@ -5445,7 +5467,7 @@ errout:
 
 static int smart_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
 {
-  FAR struct smart_struct_s *dev ;
+  FAR struct smart_struct_s *dev;
   int ret;
 #if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_FS_PROCFS_EXCLUDE_SMARTFS)
   FAR struct mtd_smart_procfs_data_s *procfs_data;
@@ -5647,15 +5669,15 @@ static int smart_fsck_crc(FAR struct smart_struct_s *dev,
 static int smart_fsck_file(FAR struct smart_struct_s *dev,
                            FAR uint8_t *checkmap, uint16_t logsector)
 {
-  int                               ret = OK;
+  int ret = OK;
-  ssize_t                           size;
+  ssize_t size;
-  uint32_t                          readaddress;
+  uint32_t readaddress;
-  FAR struct smart_sect_header_s    *header;
+  FAR struct smart_sect_header_s *header;
-  FAR struct smart_chain_header_s   *chain;
+  FAR struct smart_chain_header_s *chain;
-  FAR uint8_t                       *usedmap;
+  FAR uint8_t *usedmap;
-  size_t                            mapsize;
+  size_t mapsize;
-  uint16_t                          physsector;
+  uint16_t physsector;
-  int                               i;
+  int i;
 
   if (logsector >= dev->totalsectors)
     {
@@ -5770,22 +5792,22 @@ static int smart_fsck_file(FAR struct smart_struct_s *dev,
 static int smart_fsck_directory(FAR struct smart_struct_s *dev,
                                 FAR uint8_t *checkmap, uint16_t logsector)
 {
-  int                               ret = OK;
+  int ret = OK;
-  int                               relocate = 0;
+  int relocate = 0;
-  ssize_t                           size;
+  ssize_t size;
-  FAR uint8_t                       *rwbuffer;
+  FAR uint8_t *rwbuffer;
-  FAR struct smart_sect_header_s    *header;
+  FAR struct smart_sect_header_s *header;
-  FAR struct smart_chain_header_s   *chain;
+  FAR struct smart_chain_header_s *chain;
-  FAR struct smart_entry_header_s   *entry;
+  FAR struct smart_entry_header_s *entry;
-  uint16_t                          entrysector;
+  uint16_t entrysector;
-  uint16_t                          physsector;
+  uint16_t physsector;
-  uint16_t                          nextsector;
+  uint16_t nextsector;
-  uint16_t                          newsector;
+  uint16_t newsector;
-  int                               entrysize;
+  int entrysize;
-  FAR uint8_t                       *bottom;
+  FAR uint8_t *bottom;
-  FAR uint8_t                       *cur;
+  FAR uint8_t *cur;
 #ifdef CONFIG_DEBUG_FS_INFO
-  char                              entryname[dev->namesize + 1];
+  char entryname[dev->namesize + 1];
 #endif
 
   if ((logsector < SMART_FIRST_DIR_SECTOR) ||
@@ -6027,14 +6049,14 @@ errout:
 
 static int smart_fsck(FAR struct smart_struct_s *dev)
 {
-  uint16_t      logsector;
+  uint16_t logsector;
 #ifndef CONFIG_MTD_SMART_MINIMIZE_RAM
-  uint16_t      physsector;
+  uint16_t physsector;
 #endif
-  FAR uint8_t   *checkmap;
+  FAR uint8_t *checkmap;
-  size_t        mapsize;
+  size_t mapsize;
-  uint8_t       rootdirentries;
+  uint8_t rootdirentries;
-  int           x;
+  int x;
 
   finfo("Entry\n");
 
@@ -6118,7 +6140,7 @@ int smart_initialize(int minor, FAR struct mtd_dev_s *mtd,
 {
   FAR struct smart_struct_s *dev;
   int ret = -ENOMEM;
-  uint32_t  totalsectors;
+  uint32_t totalsectors;
 #ifdef CONFIG_SMARTFS_MULTI_ROOT_DIRS
   FAR struct smart_multiroot_device_s *rootdirdev = NULL;
 #endif
@@ -6310,9 +6332,10 @@ static int smart_losetup(int minor, FAR const char *filename,
                 int sectsize, int erasesize, off_t offset, bool readonly)
 {
   FAR struct mtd_dev_s *mtd;
-  struct stat           sb;
+  struct stat sb;
-  int                   x, ret;
+  int x;
-  char                  devpath[20];
+  int ret;
+  char devpath[20];
 
   /* Try to create a filemtd device using the filename provided */