You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2023/01/03 22:32:20 UTC

[nuttx] branch master updated: Remove the unnecessary NULL fields in global instance definition of file_operations

This is an automated email from the ASF dual-hosted git repository.

pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 779a610ca3 Remove the unnecessary NULL fields in global instance definition of file_operations
779a610ca3 is described below

commit 779a610ca3ba495640b49d6c36bce89784955e0d
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun Jan 1 01:11:53 2023 +0800

    Remove the unnecessary NULL fields in global instance definition of file_operations
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
 arch/arm/src/cxd56xx/cxd56_adc.c                          |  4 ----
 arch/arm/src/cxd56xx/cxd56_charger.c                      |  4 ----
 arch/arm/src/cxd56xx/cxd56_gauge.c                        |  4 ----
 arch/arm/src/cxd56xx/cxd56_geofence.c                     |  3 ---
 arch/arm/src/cxd56xx/cxd56_gnss.c                         |  3 ---
 arch/arm/src/cxd56xx/cxd56_rtc_lowerhalf.c                |  6 ------
 arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c                  | 10 ----------
 arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c              |  7 -------
 arch/arm/src/lpc54xx/lpc54_rng.c                          |  7 -------
 arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c                |  6 ------
 arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c       |  6 ------
 arch/arm/src/phy62xx/phyplus_stub.c                       |  4 ----
 arch/arm/src/sama5/sam_trng.c                             |  7 -------
 arch/arm/src/sama5/sam_tsd.c                              |  3 ---
 arch/arm/src/samv7/sam_trng.c                             |  7 -------
 arch/arm/src/stm32/stm32_hrtim.c                          |  4 ----
 arch/arm/src/stm32/stm32_rng.c                            |  7 -------
 arch/arm/src/stm32/stm32_rtc_lowerhalf.c                  |  6 ------
 arch/arm/src/stm32f0l0g0/stm32_rng.c                      |  7 -------
 arch/arm/src/stm32f7/stm32_rng.c                          |  7 -------
 arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c                |  6 ------
 arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c                |  6 ------
 arch/arm/src/stm32l4/stm32l4_rng.c                        |  7 -------
 arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c              |  6 ------
 arch/arm/src/stm32wb/stm32wb_rtc_lowerhalf.c              |  6 ------
 arch/arm/src/tlsr82/tlsr82_spi_console.c                  |  4 ----
 arch/renesas/src/rx65n/rx65n_rtc_lowerhalf.c              |  6 ------
 arch/risc-v/src/bl602/bl602_rtc_lowerhalf.c               |  6 ------
 arch/risc-v/src/esp32c3/esp32c3_rtc_lowerhalf.c           | 10 ----------
 arch/x86/src/qemu/qemu_keypad.c                           |  7 -------
 arch/x86/src/qemu/qemu_vga.c                              |  5 -----
 arch/x86_64/src/intel64/intel64_rng.c                     |  7 -------
 arch/xtensa/src/esp32/esp32_himem.c                       |  4 ----
 arch/xtensa/src/esp32/esp32_rtc_lowerhalf.c               | 10 ----------
 arch/z80/src/ez80/ez80_rtc_lowerhalf.c                    | 10 ----------
 audio/audio.c                                             |  4 ----
 boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c          |  4 ----
 boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c         |  8 --------
 boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c        |  4 ----
 boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c        |  4 ----
 boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c        |  4 ----
 boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c        |  4 ----
 boards/arm/cxd56xx/drivers/sensors/bmi160_scu.c           |  8 --------
 boards/arm/cxd56xx/drivers/sensors/bmp280_scu.c           |  6 ------
 boards/arm/cxd56xx/drivers/sensors/kx022_scu.c            |  4 ----
 boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c          |  8 --------
 boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c        |  8 --------
 boards/arm/kl/freedom-kl25z/src/kl_tsi.c                  |  7 -------
 boards/arm/kl/freedom-kl26z/src/kl_tsi.c                  |  7 -------
 boards/arm/s32k1xx/rddrone-bms772/src/s32k1xx_smbus_sbd.c |  6 ------
 boards/arm/sam34/sam4l-xplained/src/sam_slcd.c            |  3 ---
 boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c   |  3 ---
 boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c          |  3 ---
 boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c   |  3 ---
 boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c    |  3 ---
 drivers/analog/adc.c                                      |  3 ---
 drivers/analog/ads1242.c                                  |  4 ----
 drivers/analog/comp.c                                     |  3 ---
 drivers/analog/dac.c                                      |  4 ----
 drivers/analog/opamp.c                                    |  4 ----
 drivers/audio/tone.c                                      |  6 ------
 drivers/can/can.c                                         |  3 ---
 drivers/contactless/mfrc522.c                             |  4 ----
 drivers/contactless/pn532.c                               |  4 ----
 drivers/crypto/dev_urandom.c                              |  3 ---
 drivers/eeprom/i2c_xx24xx.c                               | 11 -----------
 drivers/eeprom/spi_xx25xx.c                               |  4 ----
 drivers/efuse/efuse.c                                     |  4 ----
 drivers/i2s/i2schar.c                                     |  4 ----
 drivers/input/ads7843e.c                                  |  3 ---
 drivers/input/ajoystick.c                                 |  3 ---
 drivers/input/button_upper.c                              |  3 ---
 drivers/input/cypress_mbr3108.c                           |  3 ---
 drivers/input/djoystick.c                                 |  3 ---
 drivers/input/ft5x06.c                                    |  3 ---
 drivers/input/keyboard_upper.c                            |  3 ---
 drivers/input/max11802.c                                  |  3 ---
 drivers/input/mxt.c                                       |  3 ---
 drivers/input/nunchuck.c                                  |  4 ----
 drivers/input/spq10kbd.c                                  |  3 ---
 drivers/input/stmpe811_tsc.c                              |  3 ---
 drivers/input/touchscreen_upper.c                         |  3 ---
 drivers/input/tsc2007.c                                   |  3 ---
 drivers/ioexpander/gpio.c                                 |  4 ----
 drivers/ipcc/ipcc_register.c                              |  6 +-----
 drivers/lcd/ht16k33_14seg.c                               |  4 ----
 drivers/lcd/lcd_dev.c                                     |  4 ----
 drivers/lcd/st7032.c                                      |  4 ----
 drivers/leds/apa102.c                                     |  6 ------
 drivers/leds/lp503x.c                                     |  4 ----
 drivers/leds/max7219.c                                    |  6 ------
 drivers/leds/ncp5623c.c                                   |  4 ----
 drivers/leds/pca9635pw.c                                  |  4 ----
 drivers/leds/rgbled.c                                     |  6 ------
 drivers/leds/userled_upper.c                              |  4 ----
 drivers/leds/ws2812.c                                     |  5 -----
 drivers/loop/loop.c                                       |  4 ----
 drivers/loop/losetup.c                                    |  4 ----
 drivers/math/cordic.c                                     |  4 ----
 drivers/misc/dev_null.c                                   |  3 ---
 drivers/misc/dev_zero.c                                   |  3 ---
 drivers/misc/lwl_console.c                                |  6 ------
 drivers/misc/rpmsgdev.c                                   |  3 ---
 drivers/modem/u-blox.c                                    |  3 ---
 drivers/motor/foc/foc_dev.c                               |  4 ----
 drivers/motor/motor.c                                     |  4 ----
 drivers/mtd/mtd_config.c                                  |  3 ---
 drivers/mtd/mtd_config_fs.c                               |  3 ---
 drivers/mtd/smart.c                                       |  4 ----
 drivers/net/telnet.c                                      |  9 ---------
 drivers/net/tun.c                                         |  3 ---
 drivers/note/notectl_driver.c                             |  4 ----
 drivers/note/noteram_driver.c                             |  4 ----
 drivers/power/battery/battery_charger.c                   |  3 ---
 drivers/power/battery/battery_gauge.c                     |  3 ---
 drivers/power/battery/battery_monitor.c                   |  3 ---
 drivers/power/relay/relay.c                               |  4 ----
 drivers/power/supply/powerled.c                           |  4 ----
 drivers/power/supply/smps.c                               |  4 ----
 drivers/rc/lirc_dev.c                                     |  3 ---
 drivers/rf/dat-31r5-sp.c                                  |  4 ----
 drivers/rptun/rptun.c                                     |  4 ----
 drivers/sensors/adt7320.c                                 |  4 ----
 drivers/sensors/adxl345_base.c                            |  7 -------
 drivers/sensors/adxl372.c                                 |  4 ----
 drivers/sensors/ak09912.c                                 |  4 ----
 drivers/sensors/apds9960.c                                |  6 ------
 drivers/sensors/as726x.c                                  |  6 ------
 drivers/sensors/bh1750fvi.c                               |  4 ----
 drivers/sensors/bmg160.c                                  |  6 ------
 drivers/sensors/bmi160.c                                  |  4 ----
 drivers/sensors/bmp180.c                                  |  6 ------
 drivers/sensors/dhtxx.c                                   |  6 ------
 drivers/sensors/fxos8700cq.c                              |  7 -------
 drivers/sensors/hall3ph.c                                 |  4 ----
 drivers/sensors/hc_sr04.c                                 |  3 ---
 drivers/sensors/hts221.c                                  |  3 ---
 drivers/sensors/ina219.c                                  |  6 ------
 drivers/sensors/ina226.c                                  |  6 ------
 drivers/sensors/ina3221.c                                 |  6 ------
 drivers/sensors/isl29023.c                                |  4 ----
 drivers/sensors/kxtj9.c                                   |  4 ----
 drivers/sensors/lis2dh.c                                  |  3 ---
 drivers/sensors/lis3dh.c                                  |  4 ----
 drivers/sensors/lis3dsh.c                                 |  6 ------
 drivers/sensors/lis3mdl.c                                 |  6 ------
 drivers/sensors/lm75.c                                    |  4 ----
 drivers/sensors/lm92.c                                    |  4 ----
 drivers/sensors/lps25h.c                                  |  4 ----
 drivers/sensors/lsm303agr.c                               |  4 ----
 drivers/sensors/lsm330_spi.c                              |  8 --------
 drivers/sensors/lsm6dsl.c                                 |  4 ----
 drivers/sensors/lsm9ds1.c                                 |  4 ----
 drivers/sensors/ltc4151.c                                 |  6 ------
 drivers/sensors/max31855.c                                |  6 ------
 drivers/sensors/max44009.c                                |  3 ---
 drivers/sensors/max6675.c                                 |  6 ------
 drivers/sensors/mb7040.c                                  |  4 ----
 drivers/sensors/mcp9844.c                                 |  4 ----
 drivers/sensors/mlx90393.c                                |  6 ------
 drivers/sensors/mlx90614.c                                |  4 ----
 drivers/sensors/mpl115a.c                                 |  6 ------
 drivers/sensors/mpu60x0.c                                 |  5 -----
 drivers/sensors/ms58xx.c                                  |  4 ----
 drivers/sensors/msa301.c                                  |  4 ----
 drivers/sensors/qencoder.c                                |  4 ----
 drivers/sensors/sensor.c                                  |  3 ---
 drivers/sensors/t67xx.c                                   |  4 ----
 drivers/sensors/veml6070.c                                |  6 ------
 drivers/sensors/vl53l1x.c                                 |  4 ----
 drivers/sensors/xen1210.c                                 |  7 -------
 drivers/sensors/zerocross.c                               |  4 ----
 drivers/serial/ptmx.c                                     |  6 ------
 drivers/serial/serial.c                                   |  3 ---
 drivers/serial/uart_bth4.c                                |  3 ---
 drivers/syslog/ramlog.c                                   |  3 ---
 drivers/syslog/syslog_chardev.c                           |  6 ------
 drivers/syslog/syslog_console.c                           |  6 ------
 drivers/syslog/syslog_rpmsg.c                             |  6 ------
 drivers/syslog/syslog_rpmsg_server.c                      |  4 ----
 drivers/timers/capture.c                                  |  4 ----
 drivers/timers/oneshot.c                                  |  4 ----
 drivers/timers/pwm.c                                      |  4 ----
 drivers/timers/timer.c                                    |  4 ----
 drivers/timers/watchdog.c                                 |  4 ----
 drivers/usbdev/adb.c                                      |  3 ---
 drivers/usbhost/usbhost_cdcmbim.c                         |  3 ---
 drivers/usbhost/usbhost_hidkbd.c                          |  3 ---
 drivers/usbhost/usbhost_hidmouse.c                        |  3 ---
 drivers/usbhost/usbhost_xboxcontroller.c                  |  3 ---
 drivers/usbmisc/fusb301.c                                 |  3 ---
 drivers/usbmisc/fusb303.c                                 |  3 ---
 drivers/usrsock/usrsock_dev.c                             |  3 ---
 drivers/video/fb.c                                        |  3 ---
 drivers/video/max7456.c                                   |  9 ---------
 drivers/video/video.c                                     |  4 ----
 drivers/wireless/cc1101.c                                 |  3 ---
 drivers/wireless/gs2200m.c                                |  3 ---
 drivers/wireless/lpwan/sx127x/sx127x.c                    |  3 ---
 drivers/wireless/nrf24l01.c                               |  3 ---
 fs/mount/fs_automount.c                                   |  4 ----
 fs/mqueue/mq_open.c                                       |  3 ---
 fs/socket/socket.c                                        |  3 ---
 fs/vfs/fs_dir.c                                           |  4 ----
 fs/vfs/fs_epoll.c                                         |  3 ---
 fs/vfs/fs_eventfd.c                                       |  5 -----
 fs/vfs/fs_signalfd.c                                      |  3 ---
 fs/vfs/fs_timerfd.c                                       |  5 -----
 wireless/ieee802154/mac802154_device.c                    |  4 ----
 209 files changed, 1 insertion(+), 961 deletions(-)

diff --git a/arch/arm/src/cxd56xx/cxd56_adc.c b/arch/arm/src/cxd56xx/cxd56_adc.c
index c634574b1a..a2f2dc40d5 100644
--- a/arch/arm/src/cxd56xx/cxd56_adc.c
+++ b/arch/arm/src/cxd56xx/cxd56_adc.c
@@ -205,10 +205,6 @@ static const struct file_operations g_adcops =
   NULL,                      /* write */
   NULL,                      /* seek */
   cxd56_adc_ioctl,           /* ioctl */
-  NULL                       /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                     /* unlink */
-#endif
 };
 
 #if defined (CONFIG_CXD56_LPADC0) || defined (CONFIG_CXD56_LPADC0_1) || defined (CONFIG_CXD56_LPADC_ALL)
diff --git a/arch/arm/src/cxd56xx/cxd56_charger.c b/arch/arm/src/cxd56xx/cxd56_charger.c
index 90cac9db53..b7e11c2e72 100644
--- a/arch/arm/src/cxd56xx/cxd56_charger.c
+++ b/arch/arm/src/cxd56xx/cxd56_charger.c
@@ -97,10 +97,6 @@ static const struct file_operations g_chargerops =
   charger_write,  /* write */
   NULL,           /* seek */
   charger_ioctl,  /* ioctl */
-  NULL            /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 static struct charger_dev_s g_chargerdev =
diff --git a/arch/arm/src/cxd56xx/cxd56_gauge.c b/arch/arm/src/cxd56xx/cxd56_gauge.c
index c5db2383fc..4d0a6265ab 100644
--- a/arch/arm/src/cxd56xx/cxd56_gauge.c
+++ b/arch/arm/src/cxd56xx/cxd56_gauge.c
@@ -82,10 +82,6 @@ static const struct file_operations g_gaugeops =
   gauge_write,  /* write */
   NULL,         /* seek */
   gauge_ioctl,  /* ioctl */
-  NULL          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL        /* unlink */
-#endif
 };
 
 static struct bat_gauge_dev_s g_gaugedev =
diff --git a/arch/arm/src/cxd56xx/cxd56_geofence.c b/arch/arm/src/cxd56xx/cxd56_geofence.c
index ad040534f0..5570df9ab1 100644
--- a/arch/arm/src/cxd56xx/cxd56_geofence.c
+++ b/arch/arm/src/cxd56xx/cxd56_geofence.c
@@ -109,9 +109,6 @@ static const struct file_operations g_geofencefops =
   NULL,                 /* truncate */
   NULL,                 /* mmap */
   cxd56_geofence_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                /* unlink */
-#endif
 };
 
 /* ioctl command list */
diff --git a/arch/arm/src/cxd56xx/cxd56_gnss.c b/arch/arm/src/cxd56xx/cxd56_gnss.c
index 9f9683a35c..82381d3d0b 100644
--- a/arch/arm/src/cxd56xx/cxd56_gnss.c
+++ b/arch/arm/src/cxd56xx/cxd56_gnss.c
@@ -320,9 +320,6 @@ static const struct file_operations g_gnssfops =
   NULL,             /* truncate */
   NULL,             /* mmap */
   cxd56_gnss_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 /* GNSS ioctl command list */
diff --git a/arch/arm/src/cxd56xx/cxd56_rtc_lowerhalf.c b/arch/arm/src/cxd56xx/cxd56_rtc_lowerhalf.c
index a93293915f..abfc7a7e2e 100644
--- a/arch/arm/src/cxd56xx/cxd56_rtc_lowerhalf.c
+++ b/arch/arm/src/cxd56xx/cxd56_rtc_lowerhalf.c
@@ -114,12 +114,6 @@ static const struct rtc_ops_s g_rtc_ops =
   .setrelative = cxd56_setrelative,
   .cancelalarm = cxd56_cancelalarm,
 #endif
-#ifdef CONFIG_RTC_IOCTL
-  .ioctl       = NULL,
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .destroy     = NULL,
-#endif
 };
 
 /* CXD56 RTC device state */
diff --git a/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c b/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c
index 2ed3717f11..429762ce70 100644
--- a/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c
+++ b/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c
@@ -112,16 +112,6 @@ static const struct rtc_ops_s g_rtc_ops =
   .cancelalarm    = imxrt_cancelalarm,
   .rdalarm        = imxrt_rdalarm,
 #endif
-#ifdef CONFIG_RTC_PERIODIC
-  .setperiodic    = NULL,  /* Not implemented */
-  .cancelperiodic = NULL,
-#endif
-#ifdef CONFIG_RTC_IOCTL
-  .ioctl          = NULL,
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .destroy        = NULL,
-#endif
 };
 
 /* i.MXRT RTC device state */
diff --git a/arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c b/arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c
index 3c859d8457..65676fcf59 100644
--- a/arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c
+++ b/arch/arm/src/kinetis/kinetis_rtc_lowerhalf.c
@@ -109,19 +109,12 @@ static const struct rtc_ops_s g_rtc_ops =
 {
   .rdtime      = kinetis_rdtime,
   .settime     = kinetis_settime,
-  .havesettime = NULL,
 #ifdef CONFIG_RTC_ALARM
   .setalarm    = kinetis_setalarm,
   .setrelative = kinetis_setrelative,
   .cancelalarm = kinetis_cancelalarm,
   .rdalarm     = kinetis_rdalarm,
 #endif
-#ifdef CONFIG_RTC_IOCTL
-  .ioctl       = NULL,
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .destroy     = NULL,
-#endif
 };
 
 /* Kinetis RTC device operations */
diff --git a/arch/arm/src/lpc54xx/lpc54_rng.c b/arch/arm/src/lpc54xx/lpc54_rng.c
index cd06eb0885..adf24c055d 100644
--- a/arch/arm/src/lpc54xx/lpc54_rng.c
+++ b/arch/arm/src/lpc54xx/lpc54_rng.c
@@ -65,13 +65,6 @@ static const struct file_operations g_rngops =
   NULL,            /* open */
   NULL,            /* close */
   lpc54_read,      /* read */
-  NULL,            /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c b/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c
index 5d9169dd1d..51ef847136 100644
--- a/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c
+++ b/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c
@@ -133,12 +133,6 @@ static const struct rtc_ops_s g_rtc_ops =
   .setperiodic    = lpc54_setperiodic,
   .cancelperiodic = lpc54_cancelperiodic,
 #endif
-#ifdef CONFIG_RTC_IOCTL
-  .ioctl          = NULL,
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .destroy        = NULL,
-#endif
 };
 
 /* LPC54 RTC device state */
diff --git a/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c b/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c
index f7aeb31c33..2f8c993c79 100644
--- a/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c
+++ b/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c
@@ -139,12 +139,6 @@ static const struct rtc_ops_s g_rtc_ops =
   .setperiodic    = max326_setperiodic,
   .cancelperiodic = max326_cancelperiodic,
 #endif
-#ifdef CONFIG_RTC_IOCTL
-  .ioctl       = NULL,
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .destroy     = NULL,
-#endif
 };
 
 /* RTC device state */
diff --git a/arch/arm/src/phy62xx/phyplus_stub.c b/arch/arm/src/phy62xx/phyplus_stub.c
index fafdf6cbbf..acd5e859ce 100644
--- a/arch/arm/src/phy62xx/phyplus_stub.c
+++ b/arch/arm/src/phy62xx/phyplus_stub.c
@@ -74,10 +74,6 @@ static const struct file_operations g_stub_drvrops =
   phyplus_stub_write,  /* write */
   phyplus_stub_seek,   /* seek */
   phyplus_stub_ioctl,  /* ioctl */
-  NULL                 /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL               /* unlink */
-#endif
 };
 
 /* static struct gpio_dev_s stub_dev; */
diff --git a/arch/arm/src/sama5/sam_trng.c b/arch/arm/src/sama5/sam_trng.c
index 547f3d272d..ff41e9153a 100644
--- a/arch/arm/src/sama5/sam_trng.c
+++ b/arch/arm/src/sama5/sam_trng.c
@@ -85,13 +85,6 @@ static const struct file_operations g_trngops =
   NULL,            /* open */
   NULL,            /* close */
   sam_read,        /* read */
-  NULL,            /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c
index 888d4a34e6..378613179a 100644
--- a/arch/arm/src/sama5/sam_tsd.c
+++ b/arch/arm/src/sama5/sam_tsd.c
@@ -252,9 +252,6 @@ static const struct file_operations g_tsdops =
   NULL,            /* truncate */
   NULL,            /* mmap */
   sam_tsd_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /* The driver state structure is pre-allocated. */
diff --git a/arch/arm/src/samv7/sam_trng.c b/arch/arm/src/samv7/sam_trng.c
index 8a977aa597..3197f6b1bd 100644
--- a/arch/arm/src/samv7/sam_trng.c
+++ b/arch/arm/src/samv7/sam_trng.c
@@ -85,13 +85,6 @@ static const struct file_operations g_trngops =
   NULL,            /* open */
   NULL,            /* close */
   sam_read,        /* read */
-  NULL,            /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32/stm32_hrtim.c b/arch/arm/src/stm32/stm32_hrtim.c
index 4cb73bf9dc..847d0f8d0c 100644
--- a/arch/arm/src/stm32/stm32_hrtim.c
+++ b/arch/arm/src/stm32/stm32_hrtim.c
@@ -795,10 +795,6 @@ static const struct file_operations hrtim_fops =
   NULL,               /* write */
   NULL,               /* seek */
   stm32_hrtim_ioctl,  /* ioctl */
-  NULL                /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL              /* unlink */
-#endif
 };
 #endif /* CONFIG_STM32_HRTIM_DISABLE_CHARDRV */
 
diff --git a/arch/arm/src/stm32/stm32_rng.c b/arch/arm/src/stm32/stm32_rng.c
index 39166e3737..0391f58657 100644
--- a/arch/arm/src/stm32/stm32_rng.c
+++ b/arch/arm/src/stm32/stm32_rng.c
@@ -81,13 +81,6 @@ static const struct file_operations g_rngops =
   NULL,            /* open */
   NULL,            /* close */
   stm32_rng_read,  /* read */
-  NULL,            /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32/stm32_rtc_lowerhalf.c b/arch/arm/src/stm32/stm32_rtc_lowerhalf.c
index ace19b5d39..0f277c8fc8 100644
--- a/arch/arm/src/stm32/stm32_rtc_lowerhalf.c
+++ b/arch/arm/src/stm32/stm32_rtc_lowerhalf.c
@@ -146,12 +146,6 @@ static const struct rtc_ops_s g_rtc_ops =
   .setperiodic    = stm32_setperiodic,
   .cancelperiodic = stm32_cancelperiodic,
 #endif
-#ifdef CONFIG_RTC_IOCTL
-  .ioctl       = NULL,
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .destroy     = NULL,
-#endif
 };
 
 /* STM32 RTC device state */
diff --git a/arch/arm/src/stm32f0l0g0/stm32_rng.c b/arch/arm/src/stm32f0l0g0/stm32_rng.c
index d492778145..389221760b 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_rng.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_rng.c
@@ -81,13 +81,6 @@ static const struct file_operations g_rngops =
   NULL,            /* open */
   NULL,            /* close */
   stm32_rng_read,  /* read */
-  NULL,            /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32f7/stm32_rng.c b/arch/arm/src/stm32f7/stm32_rng.c
index 7d8e3117ce..2e3cd632b1 100644
--- a/arch/arm/src/stm32f7/stm32_rng.c
+++ b/arch/arm/src/stm32f7/stm32_rng.c
@@ -80,13 +80,6 @@ static const struct file_operations g_rngops =
   NULL,            /* open */
   NULL,            /* close */
   stm32_rngread,   /* read */
-  NULL,            /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c b/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
index 8aa12bee23..af26ba0a1f 100644
--- a/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
+++ b/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c
@@ -142,12 +142,6 @@ static const struct rtc_ops_s g_rtc_ops =
   .setperiodic    = stm32_setperiodic,
   .cancelperiodic = stm32_cancelperiodic,
 #endif
-#ifdef CONFIG_RTC_IOCTL
-  .ioctl       = NULL,
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .destroy     = NULL,
-#endif
 };
 
 /* STM32 RTC device state */
diff --git a/arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c b/arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c
index 953f50e660..490c4df83f 100644
--- a/arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c
+++ b/arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c
@@ -143,12 +143,6 @@ static const struct rtc_ops_s g_rtc_ops =
   .setperiodic    = stm32_setperiodic,
   .cancelperiodic = stm32_cancelperiodic,
 #endif
-#ifdef CONFIG_RTC_IOCTL
-  .ioctl       = NULL,
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .destroy     = NULL,
-#endif
 };
 
 /* STM32 RTC device state */
diff --git a/arch/arm/src/stm32l4/stm32l4_rng.c b/arch/arm/src/stm32l4/stm32l4_rng.c
index 3bf6e45959..365688d30d 100644
--- a/arch/arm/src/stm32l4/stm32l4_rng.c
+++ b/arch/arm/src/stm32l4/stm32l4_rng.c
@@ -81,13 +81,6 @@ static const struct file_operations g_rngops =
   NULL,            /* open */
   NULL,            /* close */
   stm32l4_rngread, /* read */
-  NULL,            /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c b/arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c
index b2836ec2fb..70275bfaba 100644
--- a/arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c
+++ b/arch/arm/src/stm32l4/stm32l4_rtc_lowerhalf.c
@@ -142,12 +142,6 @@ static const struct rtc_ops_s g_rtc_ops =
   .setperiodic    = stm32l4_setperiodic,
   .cancelperiodic = stm32l4_cancelperiodic,
 #endif
-#ifdef CONFIG_RTC_IOCTL
-  .ioctl       = NULL,
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .destroy     = NULL,
-#endif
 };
 
 /* STM32L4 RTC device state */
diff --git a/arch/arm/src/stm32wb/stm32wb_rtc_lowerhalf.c b/arch/arm/src/stm32wb/stm32wb_rtc_lowerhalf.c
index 5b8871d851..d5e582e902 100644
--- a/arch/arm/src/stm32wb/stm32wb_rtc_lowerhalf.c
+++ b/arch/arm/src/stm32wb/stm32wb_rtc_lowerhalf.c
@@ -141,12 +141,6 @@ static const struct rtc_ops_s g_rtc_ops =
   .setperiodic    = stm32wb_setperiodic,
   .cancelperiodic = stm32wb_cancelperiodic,
 #endif
-#ifdef CONFIG_RTC_IOCTL
-  .ioctl       = NULL,
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .destroy     = NULL,
-#endif
 };
 
 /* STM32WB RTC device state */
diff --git a/arch/arm/src/tlsr82/tlsr82_spi_console.c b/arch/arm/src/tlsr82/tlsr82_spi_console.c
index 73a37e352d..6aaa6de092 100644
--- a/arch/arm/src/tlsr82/tlsr82_spi_console.c
+++ b/arch/arm/src/tlsr82/tlsr82_spi_console.c
@@ -119,10 +119,6 @@ static const struct file_operations g_consoleops =
   spi_console_write,    /* write */
   NULL,                 /* seek */
   spi_console_ioctl,    /* ioctl */
-  NULL                  /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/arch/renesas/src/rx65n/rx65n_rtc_lowerhalf.c b/arch/renesas/src/rx65n/rx65n_rtc_lowerhalf.c
index 3b59343972..4262bbc0dc 100644
--- a/arch/renesas/src/rx65n/rx65n_rtc_lowerhalf.c
+++ b/arch/renesas/src/rx65n/rx65n_rtc_lowerhalf.c
@@ -145,12 +145,6 @@ static const struct rtc_ops_s g_rtc_ops =
   .setperiodic    = rx65n_setperiodic,
   .cancelperiodic = rx65n_cancelperiodic,
 #endif
-#ifdef CONFIG_RTC_IOCTL
-  .ioctl       = NULL,
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .destroy     = NULL,
-#endif
 };
 
 /* RX65N RTC device state */
diff --git a/arch/risc-v/src/bl602/bl602_rtc_lowerhalf.c b/arch/risc-v/src/bl602/bl602_rtc_lowerhalf.c
index ae11d9e521..f6e4b2774e 100644
--- a/arch/risc-v/src/bl602/bl602_rtc_lowerhalf.c
+++ b/arch/risc-v/src/bl602/bl602_rtc_lowerhalf.c
@@ -142,12 +142,6 @@ static const struct rtc_ops_s g_rtc_ops =
   .setperiodic    = bl602_setperiodic,
   .cancelperiodic = bl602_cancelperiodic,
 #endif
-#ifdef CONFIG_RTC_IOCTL
-  .ioctl       = NULL,
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .destroy     = NULL,
-#endif
 };
 
 /* BL602 RTC device state */
diff --git a/arch/risc-v/src/esp32c3/esp32c3_rtc_lowerhalf.c b/arch/risc-v/src/esp32c3/esp32c3_rtc_lowerhalf.c
index b31a6ab4dd..017c4a91a7 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rtc_lowerhalf.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_rtc_lowerhalf.c
@@ -109,16 +109,6 @@ static const struct rtc_ops_s g_rtc_ops =
   .cancelalarm = rtc_lh_cancelalarm,
   .rdalarm     = rtc_lh_rdalarm,
 #endif
-#ifdef CONFIG_RTC_PERIODIC
-  .setperiodic    = NULL,
-  .cancelperiodic = NULL,
-#endif
-#ifdef CONFIG_RTC_IOCTL
-  .ioctl       = NULL,
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .destroy     = NULL,
-#endif
 };
 
 /* ESP32-C3 RTC device state */
diff --git a/arch/x86/src/qemu/qemu_keypad.c b/arch/x86/src/qemu/qemu_keypad.c
index fa5e15b835..3b67163f63 100644
--- a/arch/x86/src/qemu/qemu_keypad.c
+++ b/arch/x86/src/qemu/qemu_keypad.c
@@ -254,13 +254,6 @@ static const struct file_operations g_keypadops =
   NULL,         /* open */
   NULL,         /* close */
   keypad_read,  /* read */
-  NULL,         /* write */
-  NULL,         /* seek */
-  NULL,         /* ioctl */
-  NULL          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/arch/x86/src/qemu/qemu_vga.c b/arch/x86/src/qemu/qemu_vga.c
index f5779dd8cd..da9446c4c5 100644
--- a/arch/x86/src/qemu/qemu_vga.c
+++ b/arch/x86/src/qemu/qemu_vga.c
@@ -235,11 +235,6 @@ static const struct file_operations g_vgaops =
   vga_read,     /* read */
   vga_write,    /* write */
   vga_seek,     /* seek */
-  NULL,         /* ioctl */
-  NULL          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/arch/x86_64/src/intel64/intel64_rng.c b/arch/x86_64/src/intel64/intel64_rng.c
index 663e0b065d..53d18600d3 100644
--- a/arch/x86_64/src/intel64/intel64_rng.c
+++ b/arch/x86_64/src/intel64/intel64_rng.c
@@ -56,13 +56,6 @@ static const struct file_operations g_rngops =
   NULL,            /* open */
   NULL,            /* close */
   x86_rngread,     /* read */
-  NULL,            /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/arch/xtensa/src/esp32/esp32_himem.c b/arch/xtensa/src/esp32/esp32_himem.c
index 31ba7fab6f..0c1035c150 100644
--- a/arch/xtensa/src/esp32/esp32_himem.c
+++ b/arch/xtensa/src/esp32/esp32_himem.c
@@ -148,10 +148,6 @@ static const struct file_operations g_himemfops =
   himem_write,      /* write */
   NULL,             /* seek */
   himem_ioctl,      /* ioctl */
-  NULL              /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/arch/xtensa/src/esp32/esp32_rtc_lowerhalf.c b/arch/xtensa/src/esp32/esp32_rtc_lowerhalf.c
index 761a14e5d4..af07906fea 100644
--- a/arch/xtensa/src/esp32/esp32_rtc_lowerhalf.c
+++ b/arch/xtensa/src/esp32/esp32_rtc_lowerhalf.c
@@ -109,16 +109,6 @@ static const struct rtc_ops_s g_rtc_ops =
   .cancelalarm = rtc_lh_cancelalarm,
   .rdalarm     = rtc_lh_rdalarm,
 #endif
-#ifdef CONFIG_RTC_PERIODIC
-  .setperiodic    = NULL,
-  .cancelperiodic = NULL,
-#endif
-#ifdef CONFIG_RTC_IOCTL
-  .ioctl       = NULL,
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .destroy     = NULL,
-#endif
 };
 
 /* ESP32 RTC device state */
diff --git a/arch/z80/src/ez80/ez80_rtc_lowerhalf.c b/arch/z80/src/ez80/ez80_rtc_lowerhalf.c
index 9519dc73af..daba8401ef 100644
--- a/arch/z80/src/ez80/ez80_rtc_lowerhalf.c
+++ b/arch/z80/src/ez80/ez80_rtc_lowerhalf.c
@@ -119,16 +119,6 @@ static const struct rtc_ops_s g_rtc_ops =
     ez80_cancelalarm,   /* cancelalarm */
     ez80_rdalarm        /* rdalarm */
 #endif
-#ifdef CONFIG_RTC_PERIODIC
-  , NULL,               /* setperiodic */
-    NULL                /* cancelperiodic */
-#endif
-#ifdef CONFIG_RTC_IOCTL
-  , NULL                /* ioctl */
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                /* destroy */
-#endif
 };
 
 /* eZ80 RTC device state */
diff --git a/audio/audio.c b/audio/audio.c
index 3dd3169f87..6505f1b03c 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -121,10 +121,6 @@ static const struct file_operations g_audioops =
   audio_write, /* write */
   NULL,        /* seek */
   audio_ioctl, /* ioctl */
-  NULL         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL       /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c b/boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c
index e1191ce20a..d69ebc9ad0 100644
--- a/boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c
@@ -173,10 +173,6 @@ static const struct file_operations g_ak09912fops =
   ak09912_write,                 /* write */
   NULL,                          /* seek */
   ak09912_ioctl,                 /* ioctl */
-  NULL                           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                         /* unlink */
-#endif
 };
 
 /* Take XYZ data, temperature and Status 2 register.
diff --git a/boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c b/boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c
index 9f0cafd71b..d6c7f9f778 100644
--- a/boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c
@@ -183,10 +183,6 @@ static const struct file_operations g_apds9930alsfops =
   apds9930_write,              /* write */
   NULL,                        /* seek */
   apds9930_ioctl_als,          /* ioctl */
-  NULL                         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                       /* unlink */
-#endif
 };
 
 /* Proximity sensor */
@@ -199,10 +195,6 @@ static const struct file_operations g_apds9930psfops =
   apds9930_write,              /* write */
   NULL,                        /* seek */
   apds9930_ioctl_ps,           /* ioctl */
-  NULL                         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                       /* unlink */
-#endif
 };
 
 /* SCU instructions for pick ambient light sensing data. */
diff --git a/boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c b/boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c
index da01753f87..e17f59a7a8 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c
@@ -105,10 +105,6 @@ static const struct file_operations g_bh1721fvcfops =
   bh1721fvc_write,             /* write */
   NULL,                        /* seek */
   bh1721fvc_ioctl,             /* ioctl */
-  NULL                         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                       /* unlink */
-#endif
 };
 
 /* Take ambient light data. */
diff --git a/boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c b/boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c
index bfc38eda7c..7b710432c2 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c
@@ -127,10 +127,6 @@ static const struct file_operations g_bh1745nucfops =
   bh1745nuc_write,             /* write */
   NULL,                        /* seek */
   bh1745nuc_ioctl,             /* ioctl */
-  NULL                         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                       /* unlink */
-#endif
 };
 
 /* Take color data. */
diff --git a/boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c b/boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c
index ea1b08cec2..79de792832 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c
@@ -127,10 +127,6 @@ static const struct file_operations g_bm1383glvfops =
   bm1383glv_write,             /* write */
   NULL,                        /* seek */
   bm1383glv_ioctl,             /* ioctl */
-  NULL                         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                       /* unlink */
-#endif
 };
 
 /* Device is not BM1383AGLV but BM1383GLV */
diff --git a/boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c b/boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c
index 5f13424711..bdf58edc27 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c
@@ -141,10 +141,6 @@ static const struct file_operations g_bm1422gmvfops =
   bm1422gmv_write,             /* write */
   NULL,                        /* seek */
   bm1422gmv_ioctl,             /* ioctl */
-  NULL                         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                       /* unlink */
-#endif
 };
 
 /* Take XYZ data. */
diff --git a/boards/arm/cxd56xx/drivers/sensors/bmi160_scu.c b/boards/arm/cxd56xx/drivers/sensors/bmi160_scu.c
index f1e0e5f8ab..8c8bce9aae 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bmi160_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bmi160_scu.c
@@ -297,10 +297,6 @@ static const struct file_operations g_bmi160gyrofops =
   NULL,                /* write */
   NULL,                /* seek */
   bmi160_ioctl,        /* ioctl */
-  NULL                 /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL               /* unlink */
-#endif
 };
 
 static const struct file_operations g_bmi160accelfops =
@@ -311,10 +307,6 @@ static const struct file_operations g_bmi160accelfops =
   NULL,                 /* write */
   NULL,                 /* seek */
   bmi160_ioctl,         /* ioctl */
-  NULL                  /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                /* unlink */
-#endif
 };
 
 /* SCU instructions for pick gyro sensing data. */
diff --git a/boards/arm/cxd56xx/drivers/sensors/bmp280_scu.c b/boards/arm/cxd56xx/drivers/sensors/bmp280_scu.c
index 5fd0e05e1d..62d15f37b9 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bmp280_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bmp280_scu.c
@@ -177,9 +177,6 @@ static const struct file_operations g_bmp280pressfops =
   bmp280_write,                 /* write */
   NULL,                         /* seek */
   bmp280_ioctl_press            /* ioctl */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                        /* unlink */
-#endif
 };
 
 static const struct file_operations g_bmp280tempfops =
@@ -190,9 +187,6 @@ static const struct file_operations g_bmp280tempfops =
   bmp280_write,                 /* write */
   NULL,                         /* seek */
   bmp280_ioctl_temp             /* ioctl */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                        /* unlink */
-#endif
 };
 
 /* SCU instructions for pick pressure sensing data. */
diff --git a/boards/arm/cxd56xx/drivers/sensors/kx022_scu.c b/boards/arm/cxd56xx/drivers/sensors/kx022_scu.c
index c5bf1ec677..66ba52cce4 100644
--- a/boards/arm/cxd56xx/drivers/sensors/kx022_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/kx022_scu.c
@@ -131,10 +131,6 @@ static const struct file_operations g_kx022fops =
   kx022_write,                 /* write */
   NULL,                        /* seek */
   kx022_ioctl,                 /* ioctl */
-  NULL                         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                       /* unlink */
-#endif
 };
 
 /* Take XYZ data. */
diff --git a/boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c b/boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c
index 7be4e92902..f81e39844e 100644
--- a/boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c
@@ -178,10 +178,6 @@ static const struct file_operations g_lt1pa01alsfops =
   lt1pa01_write,               /* write */
   NULL,                        /* seek */
   lt1pa01_ioctl_als,           /* ioctl */
-  NULL                         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                       /* unlink */
-#endif
 };
 
 /* Proximity sensor */
@@ -194,10 +190,6 @@ static const struct file_operations g_lt1pa01proxfops =
   lt1pa01_write,               /* write */
   NULL,                        /* seek */
   lt1pa01_ioctl_prox,          /* ioctl */
-  NULL                         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                       /* unlink */
-#endif
 };
 
 /* SCU instructions for pick ambient light sensing data. */
diff --git a/boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c b/boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c
index 418ac15665..816bcc1111 100644
--- a/boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c
@@ -166,10 +166,6 @@ static const struct file_operations g_rpr0521rsalsfops =
   rpr0521rs_write,             /* write */
   NULL,                        /* seek */
   rpr0521rs_ioctl_als,         /* ioctl */
-  NULL                         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                       /* unlink */
-#endif
 };
 
 /* Proximity sensor */
@@ -182,10 +178,6 @@ static const struct file_operations g_rpr0521rspsfops =
   rpr0521rs_write,             /* write */
   NULL,                        /* seek */
   rpr0521rs_ioctl_ps,          /* ioctl */
-  NULL                         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                       /* unlink */
-#endif
 };
 
 /* SCU instructions for pick ambient light sensing data. */
diff --git a/boards/arm/kl/freedom-kl25z/src/kl_tsi.c b/boards/arm/kl/freedom-kl25z/src/kl_tsi.c
index 783cfbca69..8ccd3be3d0 100644
--- a/boards/arm/kl/freedom-kl25z/src/kl_tsi.c
+++ b/boards/arm/kl/freedom-kl25z/src/kl_tsi.c
@@ -86,13 +86,6 @@ static const struct file_operations tsi_ops =
   NULL,        /* open */
   NULL,        /* close */
   tsi_read,    /* read */
-  NULL,        /* write */
-  NULL,        /* seek */
-  NULL,        /* ioctl */
-  NULL         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL       /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/boards/arm/kl/freedom-kl26z/src/kl_tsi.c b/boards/arm/kl/freedom-kl26z/src/kl_tsi.c
index b6121368b1..b9d7b99608 100644
--- a/boards/arm/kl/freedom-kl26z/src/kl_tsi.c
+++ b/boards/arm/kl/freedom-kl26z/src/kl_tsi.c
@@ -87,13 +87,6 @@ static const struct file_operations tsi_ops =
   NULL,        /* open */
   NULL,        /* close */
   tsi_read,    /* read */
-  NULL,        /* write */
-  NULL,        /* seek */
-  NULL,        /* ioctl */
-  NULL         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL       /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/boards/arm/s32k1xx/rddrone-bms772/src/s32k1xx_smbus_sbd.c b/boards/arm/s32k1xx/rddrone-bms772/src/s32k1xx_smbus_sbd.c
index 5d421fbcd3..68f4841109 100644
--- a/boards/arm/s32k1xx/rddrone-bms772/src/s32k1xx_smbus_sbd.c
+++ b/boards/arm/s32k1xx/rddrone-bms772/src/s32k1xx_smbus_sbd.c
@@ -99,12 +99,6 @@ static const struct file_operations smbus_sbd_fops =
 #endif
   smbus_sbd_read,  /* read */
   smbus_sbd_write, /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL,            /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  NULL,            /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c
index 0002e3ca6f..359d3352b8 100644
--- a/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c
+++ b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c
@@ -299,9 +299,6 @@ static const struct file_operations g_slcdops =
   NULL,          /* truncate */
   NULL,          /* mmap */
   slcd_poll      /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /* LCD state data */
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c
index b22be31a6e..ffce500f3c 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c
@@ -271,9 +271,6 @@ static const struct file_operations tc_fops =
   NULL,       /* truncate */
   NULL,       /* mmap */
   tc_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL      /* unlink */
-#endif
 };
 
 /* If only a single touchscreen device is supported, then the driver state
diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c
index e8c8bf90fe..f44f4ad9b1 100644
--- a/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c
+++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c
@@ -349,9 +349,6 @@ static const struct file_operations g_slcdops =
   NULL,          /* truncate */
   NULL,          /* mmap */
   slcd_poll      /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /* LCD state data */
diff --git a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c
index 04786a968a..9c30839a28 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c
+++ b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c
@@ -252,9 +252,6 @@ static const struct file_operations tc_fops =
   NULL,       /* truncate */
   NULL,       /* mmap */
   tc_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL      /* unlink */
-#endif
 };
 
 /* If only a single touchscreen device is supported, then the driver state
diff --git a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c
index 9fe29b59ba..682feabfc1 100644
--- a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c
+++ b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c
@@ -184,9 +184,6 @@ static const struct file_operations g_lcdops =
   NULL,          /* truncate */
   NULL,          /* mmap */
   lcd_poll       /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /* This is the driver state structure */
diff --git a/drivers/analog/adc.c b/drivers/analog/adc.c
index f8df2343a6..dd60763a69 100644
--- a/drivers/analog/adc.c
+++ b/drivers/analog/adc.c
@@ -75,9 +75,6 @@ static const struct file_operations g_adc_fops =
   NULL,         /* truncate */
   NULL,         /* mmap */
   adc_poll      /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL        /* unlink */
-#endif
 };
 
 static const struct adc_callback_s g_adc_callback =
diff --git a/drivers/analog/ads1242.c b/drivers/analog/ads1242.c
index e4f82ac305..c7a035bea0 100644
--- a/drivers/analog/ads1242.c
+++ b/drivers/analog/ads1242.c
@@ -107,10 +107,6 @@ static const struct file_operations g_ads1242_fops =
   ads1242_write,  /* write */
   NULL,           /* seek */
   ads1242_ioctl,  /* ioctl */
-  NULL            /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/analog/comp.c b/drivers/analog/comp.c
index 0fc956d6c0..551da7b9ea 100644
--- a/drivers/analog/comp.c
+++ b/drivers/analog/comp.c
@@ -68,9 +68,6 @@ static const struct file_operations comp_fops =
   NULL,                         /* truncate */
   NULL,                         /* mmap */
   comp_poll                     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                        /* unlink */
-#endif
 };
 
 static const struct comp_callback_s g_comp_callback =
diff --git a/drivers/analog/dac.c b/drivers/analog/dac.c
index 4842b1e745..7de176aee5 100644
--- a/drivers/analog/dac.c
+++ b/drivers/analog/dac.c
@@ -69,10 +69,6 @@ static const struct file_operations dac_fops =
   dac_write,      /* write */
   NULL,           /* seek */
   dac_ioctl,      /* ioctl */
-  NULL            /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/analog/opamp.c b/drivers/analog/opamp.c
index 53211fa083..ed60f49a95 100644
--- a/drivers/analog/opamp.c
+++ b/drivers/analog/opamp.c
@@ -57,10 +57,6 @@ static const struct file_operations opamp_fops =
   NULL,                          /* write */
   NULL,                          /* seek */
   opamp_ioctl,                   /* ioctl */
-  NULL                           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/audio/tone.c b/drivers/audio/tone.c
index 3e397fa4aa..092ff417a1 100644
--- a/drivers/audio/tone.c
+++ b/drivers/audio/tone.c
@@ -170,12 +170,6 @@ static const struct file_operations g_toneops =
   tone_close,                   /* close */
   tone_read,                    /* read */
   tone_write,                   /* write */
-  NULL,                         /* seek */
-  NULL,                         /* ioctl */
-  NULL                          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/can/can.c b/drivers/can/can.c
index 78a72255ff..d4b26573e2 100644
--- a/drivers/can/can.c
+++ b/drivers/can/can.c
@@ -138,9 +138,6 @@ static const struct file_operations g_canops =
   NULL,      /* truncate */
   NULL,      /* mmap */
   can_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL     /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/contactless/mfrc522.c b/drivers/contactless/mfrc522.c
index 50dec23a46..378aec028a 100644
--- a/drivers/contactless/mfrc522.c
+++ b/drivers/contactless/mfrc522.c
@@ -114,10 +114,6 @@ static const struct file_operations g_mfrc522fops =
   mfrc522_write,  /* write */
   NULL,           /* seek */
   mfrc522_ioctl,  /* ioctl */
-  NULL            /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/contactless/pn532.c b/drivers/contactless/pn532.c
index 2552bd16f4..826974c16e 100644
--- a/drivers/contactless/pn532.c
+++ b/drivers/contactless/pn532.c
@@ -110,10 +110,6 @@ static const struct file_operations g_pn532fops =
   _write,         /* write */
   NULL,           /* seek */
   _ioctl,         /* ioctl */
-  NULL            /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 static const uint8_t pn532ack[] =
diff --git a/drivers/crypto/dev_urandom.c b/drivers/crypto/dev_urandom.c
index 5496ab60d9..89e8fc2e98 100644
--- a/drivers/crypto/dev_urandom.c
+++ b/drivers/crypto/dev_urandom.c
@@ -103,9 +103,6 @@ static const struct file_operations g_urand_fops =
   NULL,                         /* truncate */
   NULL,                         /* mmap */
   devurand_poll                 /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                        /* unlink */
-#endif
 };
 
 #ifdef CONFIG_DEV_URANDOM_XORSHIFT128
diff --git a/drivers/eeprom/i2c_xx24xx.c b/drivers/eeprom/i2c_xx24xx.c
index a8f3b2e3e1..505873bf86 100644
--- a/drivers/eeprom/i2c_xx24xx.c
+++ b/drivers/eeprom/i2c_xx24xx.c
@@ -239,10 +239,6 @@ static const struct file_operations ee24xx_fops =
   ee24xx_write, /* write */
   ee24xx_seek,  /* seek */
   ee24xx_ioctl, /* ioctl */
-  NULL          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL        /* unlink */
-#endif
 };
 
 #ifdef CONFIG_AT24CS_UUID
@@ -251,13 +247,6 @@ static const struct file_operations at24cs_uuid_fops =
   ee24xx_open,      /* piggyback on the ee24xx_open */
   ee24xx_close,     /* piggyback on the ee24xx_close */
   at24cs_read_uuid, /* read */
-  NULL,             /* write */
-  NULL,             /* seek */
-  NULL,             /* ioctl */
-  NULL              /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 #endif
 
diff --git a/drivers/eeprom/spi_xx25xx.c b/drivers/eeprom/spi_xx25xx.c
index 69426920e5..f5b94ba430 100644
--- a/drivers/eeprom/spi_xx25xx.c
+++ b/drivers/eeprom/spi_xx25xx.c
@@ -276,10 +276,6 @@ static const struct file_operations ee25xx_fops =
   ee25xx_write, /* write */
   ee25xx_seek,  /* seek */
   ee25xx_ioctl, /* ioctl */
-  NULL          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/efuse/efuse.c b/drivers/efuse/efuse.c
index 26583a0dbb..f790ca2d5f 100644
--- a/drivers/efuse/efuse.c
+++ b/drivers/efuse/efuse.c
@@ -84,10 +84,6 @@ static const struct file_operations g_efuseops =
   efuse_write, /* write */
   NULL,        /* seek */
   efuse_ioctl, /* ioctl */
-  NULL         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL       /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/i2s/i2schar.c b/drivers/i2s/i2schar.c
index 0f0c0a971c..e7ec9880ea 100644
--- a/drivers/i2s/i2schar.c
+++ b/drivers/i2s/i2schar.c
@@ -112,10 +112,6 @@ static const struct file_operations i2schar_fops =
   i2schar_write,        /* write */
   NULL,                 /* seek  */
   i2schar_ioctl,        /* ioctl */
-  NULL                  /* poll  */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c
index f7602f2b42..8a825e2820 100644
--- a/drivers/input/ads7843e.c
+++ b/drivers/input/ads7843e.c
@@ -125,9 +125,6 @@ static const struct file_operations ads7843e_fops =
   NULL,             /* truncate */
   NULL,             /* mmap */
   ads7843e_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 /* If only a single ADS7843E device is supported, then the driver state
diff --git a/drivers/input/ajoystick.c b/drivers/input/ajoystick.c
index e9acb48266..9c71938431 100644
--- a/drivers/input/ajoystick.c
+++ b/drivers/input/ajoystick.c
@@ -138,9 +138,6 @@ static const struct file_operations ajoy_fops =
   NULL,       /* truncate */
   NULL,       /* mmap */
   ajoy_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL      /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/input/button_upper.c b/drivers/input/button_upper.c
index 007a9ffc30..b461a7d893 100644
--- a/drivers/input/button_upper.c
+++ b/drivers/input/button_upper.c
@@ -136,9 +136,6 @@ static const struct file_operations btn_fops =
   NULL,      /* truncate */
   NULL,      /* mmap */
   btn_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL     /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/input/cypress_mbr3108.c b/drivers/input/cypress_mbr3108.c
index 107bd814b3..59a7b2d362 100644
--- a/drivers/input/cypress_mbr3108.c
+++ b/drivers/input/cypress_mbr3108.c
@@ -227,9 +227,6 @@ static const struct file_operations g_mbr3108_fileops =
   NULL,           /* truncate */
   NULL,           /* mmap */
   mbr3108_poll    /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/input/djoystick.c b/drivers/input/djoystick.c
index 06a8d82890..8ab905b137 100644
--- a/drivers/input/djoystick.c
+++ b/drivers/input/djoystick.c
@@ -138,9 +138,6 @@ static const struct file_operations djoy_fops =
   NULL,       /* truncate */
   NULL,       /* mmap */
   djoy_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL      /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/input/ft5x06.c b/drivers/input/ft5x06.c
index 59f94b9a7a..6b85c17144 100644
--- a/drivers/input/ft5x06.c
+++ b/drivers/input/ft5x06.c
@@ -179,9 +179,6 @@ static const struct file_operations ft5x06_fops =
   NULL,           /* truncate */
   NULL,           /* mmap */
   ft5x06_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /* Maps FT5x06 touch events into bit encoded representation used by NuttX */
diff --git a/drivers/input/keyboard_upper.c b/drivers/input/keyboard_upper.c
index 4ab770288d..e4282dbf6a 100644
--- a/drivers/input/keyboard_upper.c
+++ b/drivers/input/keyboard_upper.c
@@ -91,9 +91,6 @@ static const struct file_operations g_keyboard_fops =
   NULL,           /* truncate */
   NULL,           /* mmap */
   keyboard_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/input/max11802.c b/drivers/input/max11802.c
index 0713c61d56..e2757482cd 100644
--- a/drivers/input/max11802.c
+++ b/drivers/input/max11802.c
@@ -118,9 +118,6 @@ static const struct file_operations max11802_fops =
   NULL,             /* truncate */
   NULL,             /* mmap */
   max11802_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 /* If only a single MAX11802 device is supported, then the driver state
diff --git a/drivers/input/mxt.c b/drivers/input/mxt.c
index 50426a9646..3f8ac456b7 100644
--- a/drivers/input/mxt.c
+++ b/drivers/input/mxt.c
@@ -283,9 +283,6 @@ static const struct file_operations mxt_fops =
   NULL,        /* truncate */
   NULL,        /* mmap */
   mxt_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL       /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/input/nunchuck.c b/drivers/input/nunchuck.c
index 75ff985983..9f1c38a900 100644
--- a/drivers/input/nunchuck.c
+++ b/drivers/input/nunchuck.c
@@ -118,10 +118,6 @@ static const struct file_operations nunchuck_fops =
   NULL,           /* write */
   NULL,           /* seek */
   nunchuck_ioctl, /* ioctl */
-  NULL            /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/input/spq10kbd.c b/drivers/input/spq10kbd.c
index 427925f4d9..250dcf942f 100644
--- a/drivers/input/spq10kbd.c
+++ b/drivers/input/spq10kbd.c
@@ -258,9 +258,6 @@ static const struct file_operations g_hidkbd_fops =
   NULL,                      /* truncate */
   NULL,                      /* mmap */
   spq10kbd_poll              /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                     /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c
index efc73437d2..c87cb7b1b2 100644
--- a/drivers/input/stmpe811_tsc.c
+++ b/drivers/input/stmpe811_tsc.c
@@ -127,9 +127,6 @@ static const struct file_operations g_stmpe811fops =
   NULL,             /* truncate */
   NULL,             /* mmap */
   stmpe811_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/input/touchscreen_upper.c b/drivers/input/touchscreen_upper.c
index 0f3a6c6c83..5a987d7b81 100644
--- a/drivers/input/touchscreen_upper.c
+++ b/drivers/input/touchscreen_upper.c
@@ -93,9 +93,6 @@ static const struct file_operations g_touch_fops =
   NULL,           /* truncate */
   NULL,           /* mmap */
   touch_poll      /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/input/tsc2007.c b/drivers/input/tsc2007.c
index 5932578c07..8a65d862b8 100644
--- a/drivers/input/tsc2007.c
+++ b/drivers/input/tsc2007.c
@@ -212,9 +212,6 @@ static const struct file_operations tsc2007_fops =
   NULL,            /* truncate */
   NULL,            /* mmap */
   tsc2007_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /* If only a single TSC2007 device is supported, then the driver state
diff --git a/drivers/ioexpander/gpio.c b/drivers/ioexpander/gpio.c
index c6313e1704..260e554924 100644
--- a/drivers/ioexpander/gpio.c
+++ b/drivers/ioexpander/gpio.c
@@ -64,10 +64,6 @@ static const struct file_operations g_gpio_drvrops =
   gpio_write,  /* write */
   gpio_seek,   /* seek */
   gpio_ioctl,  /* ioctl */
-  NULL         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL       /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/ipcc/ipcc_register.c b/drivers/ipcc/ipcc_register.c
index 208014536a..61630cd048 100644
--- a/drivers/ipcc/ipcc_register.c
+++ b/drivers/ipcc/ipcc_register.c
@@ -50,9 +50,7 @@
 
 static const struct file_operations ipcc_fops =
 {
-#ifdef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  .unlink = NULL,
-#else /* CONFIG_DISABLE_PSEUDOFS_OPERATIONS */
+#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
   .unlink = ipcc_unlink,
 #endif /* CONFIG_DISABLE_PSEUDOFS_OPERATIONS */
   .open   = ipcc_open,
@@ -60,8 +58,6 @@ static const struct file_operations ipcc_fops =
   .poll   = ipcc_poll,
   .read   = ipcc_read,
   .write  = ipcc_write,
-  .ioctl  = NULL,
-  .seek   = NULL
 };
 
 /****************************************************************************
diff --git a/drivers/lcd/ht16k33_14seg.c b/drivers/lcd/ht16k33_14seg.c
index 565e569beb..5d4c7b200a 100644
--- a/drivers/lcd/ht16k33_14seg.c
+++ b/drivers/lcd/ht16k33_14seg.c
@@ -152,10 +152,6 @@ static const struct file_operations g_ht16k33fops =
   ht16k33_write,  /* write */
   ht16k33_seek,   /* seek */
   ht16k33_ioctl,  /* ioctl */
-  NULL            /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/lcd/lcd_dev.c b/drivers/lcd/lcd_dev.c
index 19e294baad..57228cf4d9 100644
--- a/drivers/lcd/lcd_dev.c
+++ b/drivers/lcd/lcd_dev.c
@@ -74,10 +74,6 @@ static const struct file_operations lcddev_fops =
   NULL,         /* write */
   NULL,         /* seek */
   lcddev_ioctl, /* ioctl */
-  NULL          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/lcd/st7032.c b/drivers/lcd/st7032.c
index d57b94c73e..ea11277912 100644
--- a/drivers/lcd/st7032.c
+++ b/drivers/lcd/st7032.c
@@ -108,10 +108,6 @@ static const struct file_operations g_st7032fops =
   st7032_write,  /* write */
   st7032_seek,   /* seek */
   st7032_ioctl,  /* ioctl */
-  NULL           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/leds/apa102.c b/drivers/leds/apa102.c
index 0683dcfa58..7f22483c43 100644
--- a/drivers/leds/apa102.c
+++ b/drivers/leds/apa102.c
@@ -75,12 +75,6 @@ static const struct file_operations g_apa102fops =
   NULL,          /* close */
   apa102_read,   /* read */
   apa102_write,  /* write */
-  NULL,          /* seek */
-  NULL,          /* ioctl */
-  NULL           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/leds/lp503x.c b/drivers/leds/lp503x.c
index fdd1277ce9..2e5011b7c1 100644
--- a/drivers/leds/lp503x.c
+++ b/drivers/leds/lp503x.c
@@ -165,10 +165,6 @@ static const struct file_operations g_lp503x_fileops =
   NULL,                      /* write */
   NULL,                      /* seek */
   lp503x_ioctl,              /* ioctl */
-  NULL                       /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                     /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/leds/max7219.c b/drivers/leds/max7219.c
index b6a88f990a..3967da3ee2 100644
--- a/drivers/leds/max7219.c
+++ b/drivers/leds/max7219.c
@@ -85,12 +85,6 @@ static const struct file_operations g_max7219fops =
   NULL,           /* close */
   max7219_read,   /* read */
   max7219_write,  /* write */
-  NULL,           /* seek */
-  NULL,           /* ioctl */
-  NULL            /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/leds/ncp5623c.c b/drivers/leds/ncp5623c.c
index 3fd16fc82c..520865aa28 100644
--- a/drivers/leds/ncp5623c.c
+++ b/drivers/leds/ncp5623c.c
@@ -73,10 +73,6 @@ static const struct file_operations g_ncp5623c_fileops =
   ncp5623c_write,              /* write */
   NULL,                        /* seek */
   ncp5623c_ioctl,              /* ioctl */
-  NULL                         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                      /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/leds/pca9635pw.c b/drivers/leds/pca9635pw.c
index 1ced5a66f2..bed97a395a 100644
--- a/drivers/leds/pca9635pw.c
+++ b/drivers/leds/pca9635pw.c
@@ -72,10 +72,6 @@ static const struct file_operations g_pca9635pw_fileops =
   NULL,                         /* write */
   NULL,                         /* seek */
   pca9635pw_ioctl,              /* ioctl */
-  NULL                          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/leds/rgbled.c b/drivers/leds/rgbled.c
index 2bf8b58379..4fad504425 100644
--- a/drivers/leds/rgbled.c
+++ b/drivers/leds/rgbled.c
@@ -89,12 +89,6 @@ static const struct file_operations g_rgbledops =
   rgbled_close, /* close */
   rgbled_read,  /* read */
   rgbled_write, /* write */
-  NULL,         /* seek */
-  NULL,         /* ioctl */
-  NULL          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/leds/userled_upper.c b/drivers/leds/userled_upper.c
index 8446d76aad..6f90ec4841 100644
--- a/drivers/leds/userled_upper.c
+++ b/drivers/leds/userled_upper.c
@@ -105,10 +105,6 @@ static const struct file_operations userled_fops =
   userled_write,  /* write */
   NULL,           /* seek */
   userled_ioctl,  /* ioctl */
-  NULL            /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/leds/ws2812.c b/drivers/leds/ws2812.c
index 235df171f1..d352347279 100644
--- a/drivers/leds/ws2812.c
+++ b/drivers/leds/ws2812.c
@@ -172,11 +172,6 @@ static const struct file_operations g_ws2812fops =
   ws2812_read,    /* read */
   ws2812_write,   /* write */
   ws2812_seek,    /* seek */
-  NULL,           /* ioctl */
-  NULL            /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/loop/loop.c b/drivers/loop/loop.c
index a0554da312..5b8c068984 100644
--- a/drivers/loop/loop.c
+++ b/drivers/loop/loop.c
@@ -57,10 +57,6 @@ static const struct file_operations g_loop_fops =
   loop_write,    /* write */
   NULL,          /* seek */
   loop_ioctl,    /* ioctl */
-  NULL           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/loop/losetup.c b/drivers/loop/losetup.c
index 8ea964b864..d5647e4cb2 100644
--- a/drivers/loop/losetup.c
+++ b/drivers/loop/losetup.c
@@ -92,10 +92,6 @@ static const struct block_operations g_bops =
   loop_read,     /* read */
   loop_write,    /* write */
   loop_geometry, /* geometry */
-  NULL           /* ioctl */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/math/cordic.c b/drivers/math/cordic.c
index 628a257376..a20cdcc7f6 100644
--- a/drivers/math/cordic.c
+++ b/drivers/math/cordic.c
@@ -79,10 +79,6 @@ static const struct file_operations g_cordicops =
   cordic_write, /* write */
   NULL,         /* seek */
   cordic_ioctl, /* ioctl */
-  NULL          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/misc/dev_null.c b/drivers/misc/dev_null.c
index 8067011275..8a063a8a99 100644
--- a/drivers/misc/dev_null.c
+++ b/drivers/misc/dev_null.c
@@ -60,9 +60,6 @@ static const struct file_operations devnull_fops =
   NULL,          /* truncate */
   NULL,          /* mmap */
   devnull_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/misc/dev_zero.c b/drivers/misc/dev_zero.c
index 998aaa394f..63b9c4185d 100644
--- a/drivers/misc/dev_zero.c
+++ b/drivers/misc/dev_zero.c
@@ -60,9 +60,6 @@ static const struct file_operations devzero_fops =
   NULL,          /* truncate */
   NULL,          /* mmap */
   devzero_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/misc/lwl_console.c b/drivers/misc/lwl_console.c
index 37308c692d..b16b720d23 100644
--- a/drivers/misc/lwl_console.c
+++ b/drivers/misc/lwl_console.c
@@ -133,12 +133,6 @@ static const struct file_operations g_consoleops =
   NULL,                 /* close */
   lwlconsole_read,      /* read */
   lwlconsole_write,     /* write */
-  NULL,                 /* seek */
-  NULL,                 /* ioctl */
-  NULL                  /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/misc/rpmsgdev.c b/drivers/misc/rpmsgdev.c
index 3be631336f..81e4974447 100644
--- a/drivers/misc/rpmsgdev.c
+++ b/drivers/misc/rpmsgdev.c
@@ -168,9 +168,6 @@ const struct file_operations g_rpmsgdev_ops =
   NULL,                   /* truncate */
   NULL,                   /* mmap */
   rpmsgdev_poll           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                  /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/modem/u-blox.c b/drivers/modem/u-blox.c
index 86cb243909..9a9f1de90d 100644
--- a/drivers/modem/u-blox.c
+++ b/drivers/modem/u-blox.c
@@ -117,9 +117,6 @@ static const struct file_operations ubxmdm_fops =
   NULL,         /* truncate */
   NULL,         /* mmap */
   ubxmdm_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/motor/foc/foc_dev.c b/drivers/motor/foc/foc_dev.c
index ff3ae1e48a..65c0f53018 100644
--- a/drivers/motor/foc/foc_dev.c
+++ b/drivers/motor/foc/foc_dev.c
@@ -78,10 +78,6 @@ static const struct file_operations g_foc_fops =
   NULL,                         /* write */
   NULL,                         /* seek */
   foc_ioctl,                    /* ioctl */
-  NULL                          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                        /* unlink */
-#endif
 };
 
 /* FOC callbacks from the lower-half implementation to this driver */
diff --git a/drivers/motor/motor.c b/drivers/motor/motor.c
index 7c9d440667..eadedf4b0d 100644
--- a/drivers/motor/motor.c
+++ b/drivers/motor/motor.c
@@ -80,10 +80,6 @@ static const struct file_operations motor_fops =
   motor_write,                   /* write */
   NULL,                          /* seek */
   motor_ioctl,                   /* ioctl */
-  NULL                           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/mtd/mtd_config.c b/drivers/mtd/mtd_config.c
index e2f0f76536..fb6659fdf9 100644
--- a/drivers/mtd/mtd_config.c
+++ b/drivers/mtd/mtd_config.c
@@ -122,9 +122,6 @@ static const struct file_operations mtdconfig_fops =
   NULL,            /* truncate */
   NULL,            /* mmap */
   mtdconfig_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/mtd/mtd_config_fs.c b/drivers/mtd/mtd_config_fs.c
index 254a8ccbe9..3fb8f544a0 100644
--- a/drivers/mtd/mtd_config_fs.c
+++ b/drivers/mtd/mtd_config_fs.c
@@ -144,9 +144,6 @@ static const struct file_operations g_mtdnvs_fops =
   NULL,            /* Truncate */
   NULL,            /* Mmap */
   mtdconfig_poll   /* Poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* Unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/mtd/smart.c b/drivers/mtd/smart.c
index 2caf8365be..b932116597 100644
--- a/drivers/mtd/smart.c
+++ b/drivers/mtd/smart.c
@@ -482,10 +482,6 @@ static const struct file_operations g_fops =
   smart_loop_write, /* write */
   NULL,             /* seek */
   smart_loop_ioctl, /* ioctl */
-  NULL              /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 #endif /* CONFIG_SMART_DEV_LOOP */
 
diff --git a/drivers/net/telnet.c b/drivers/net/telnet.c
index fabbe81514..32c88f200a 100644
--- a/drivers/net/telnet.c
+++ b/drivers/net/telnet.c
@@ -193,9 +193,6 @@ static const struct file_operations g_telnet_fops =
   NULL,          /* truncate */
   NULL,          /* mmap */
   telnet_poll    /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 static const struct file_operations g_factory_fops =
@@ -206,12 +203,6 @@ static const struct file_operations g_factory_fops =
   factory_write, /* write */
   NULL,          /* seek */
   factory_ioctl, /* ioctl */
-  NULL,          /* truncate */
-  NULL,          /* mmap */
-  NULL           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /* This is an global data set of all of all active Telnet drivers.  This
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 43d43ade79..81fa0b1d9c 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -222,9 +222,6 @@ static const struct file_operations g_tun_file_ops =
   NULL,         /* truncate */
   NULL,         /* mmap */
   tun_poll      /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/note/notectl_driver.c b/drivers/note/notectl_driver.c
index e911e6dd16..c873870721 100644
--- a/drivers/note/notectl_driver.c
+++ b/drivers/note/notectl_driver.c
@@ -52,10 +52,6 @@ static const struct file_operations notectl_fops =
   NULL,          /* write */
   NULL,          /* seek */
   notectl_ioctl, /* ioctl */
-  NULL           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/note/noteram_driver.c b/drivers/note/noteram_driver.c
index 3938bcd91e..baf2472301 100644
--- a/drivers/note/noteram_driver.c
+++ b/drivers/note/noteram_driver.c
@@ -74,10 +74,6 @@ static const struct file_operations g_noteram_fops =
   NULL,          /* write */
   NULL,          /* seek */
   noteram_ioctl, /* ioctl */
-  NULL           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 static struct noteram_info_s g_noteram_info =
diff --git a/drivers/power/battery/battery_charger.c b/drivers/power/battery/battery_charger.c
index 0316a5d47e..bc005ca7be 100644
--- a/drivers/power/battery/battery_charger.c
+++ b/drivers/power/battery/battery_charger.c
@@ -94,9 +94,6 @@ static const struct file_operations g_batteryops =
   NULL,                /* truncate */
   NULL,                /* mmap */
   bat_charger_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL               /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/power/battery/battery_gauge.c b/drivers/power/battery/battery_gauge.c
index 0b24303e27..395ad51a84 100644
--- a/drivers/power/battery/battery_gauge.c
+++ b/drivers/power/battery/battery_gauge.c
@@ -96,9 +96,6 @@ static const struct file_operations g_batteryops =
   NULL,             /* truncate */
   NULL,             /* mmap */
   bat_gauge_poll    /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/power/battery/battery_monitor.c b/drivers/power/battery/battery_monitor.c
index 4f1c2ff5d5..447f14d1ec 100644
--- a/drivers/power/battery/battery_monitor.c
+++ b/drivers/power/battery/battery_monitor.c
@@ -95,9 +95,6 @@ static const struct file_operations g_batteryops =
   NULL,                /* truncate */
   NULL,                /* mmap */
   bat_monitor_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL               /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/power/relay/relay.c b/drivers/power/relay/relay.c
index 86a12c8d30..b688e591cc 100644
--- a/drivers/power/relay/relay.c
+++ b/drivers/power/relay/relay.c
@@ -59,10 +59,6 @@ static const struct file_operations g_relay_ops =
   relay_write,  /* write */
   NULL,         /* seek */
   relay_ioctl,  /* ioctl */
-  NULL          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/power/supply/powerled.c b/drivers/power/supply/powerled.c
index 1fc0d7df69..140ea1bdf5 100644
--- a/drivers/power/supply/powerled.c
+++ b/drivers/power/supply/powerled.c
@@ -61,10 +61,6 @@ static const struct file_operations powerled_fops =
   NULL,                         /* write */
   NULL,                         /* seek */
   powerled_ioctl,               /* ioctl */
-  NULL                          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/power/supply/smps.c b/drivers/power/supply/smps.c
index 7d12b6735e..d10bc96d6e 100644
--- a/drivers/power/supply/smps.c
+++ b/drivers/power/supply/smps.c
@@ -65,10 +65,6 @@ static const struct file_operations smps_fops =
   smps_write,                   /* write */
   NULL,                         /* seek */
   smps_ioctl,                   /* ioctl */
-  NULL                          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/rc/lirc_dev.c b/drivers/rc/lirc_dev.c
index 57a0d5e6b2..b63540e01f 100644
--- a/drivers/rc/lirc_dev.c
+++ b/drivers/rc/lirc_dev.c
@@ -106,9 +106,6 @@ static const struct file_operations g_lirc_fops =
   NULL,        /* truncate */
   NULL,        /* mmap */
   lirc_poll    /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL       /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/rf/dat-31r5-sp.c b/drivers/rf/dat-31r5-sp.c
index 9b5e890473..7fad3a46ee 100644
--- a/drivers/rf/dat-31r5-sp.c
+++ b/drivers/rf/dat-31r5-sp.c
@@ -83,10 +83,6 @@ static const struct file_operations g_dat31r5sp_fops =
   dat31r5sp_write,  /* write */
   NULL,             /* seek */
   dat31r5sp_ioctl,  /* ioctl */
-  NULL              /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/rptun/rptun.c b/drivers/rptun/rptun.c
index e7b49740ca..644a192399 100644
--- a/drivers/rptun/rptun.c
+++ b/drivers/rptun/rptun.c
@@ -177,10 +177,6 @@ static const struct file_operations g_rptun_devops =
   NULL,             /* write */
   NULL,             /* seek */
   rptun_dev_ioctl,  /* ioctl */
-  NULL              /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 #ifdef CONFIG_RPTUN_LOADER
diff --git a/drivers/sensors/adt7320.c b/drivers/sensors/adt7320.c
index 1cb46b9311..e766293760 100644
--- a/drivers/sensors/adt7320.c
+++ b/drivers/sensors/adt7320.c
@@ -106,10 +106,6 @@ static const struct file_operations g_adt7320fops =
   adt7320_write,   /* write */
   NULL,            /* seek */
   adt7320_ioctl,   /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/adxl345_base.c b/drivers/sensors/adxl345_base.c
index 1a5ea790bb..45b685b5c4 100644
--- a/drivers/sensors/adxl345_base.c
+++ b/drivers/sensors/adxl345_base.c
@@ -63,13 +63,6 @@ static const struct file_operations g_adxl345fops =
   NULL,            /* open */
   NULL,            /* close */
   adxl345_read,    /* read */
-  NULL,            /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/adxl372.c b/drivers/sensors/adxl372.c
index 3d7d85acd7..a380fd7094 100644
--- a/drivers/sensors/adxl372.c
+++ b/drivers/sensors/adxl372.c
@@ -123,10 +123,6 @@ static const struct file_operations g_adxl372_fops =
   adxl372_write,   /* write */
   adxl372_seek,    /* seek */
   adxl372_ioctl,   /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 static const struct adxl372_dvr_entry_vector_s g_adxl372_dops =
diff --git a/drivers/sensors/ak09912.c b/drivers/sensors/ak09912.c
index ac7e086682..b77eb1afcf 100644
--- a/drivers/sensors/ak09912.c
+++ b/drivers/sensors/ak09912.c
@@ -180,10 +180,6 @@ static const struct file_operations g_ak09912fops =
   ak09912_write,                 /* write */
   NULL,                          /* seek */
   ak09912_ioctl,                 /* ioctl */
-  NULL                           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/apds9960.c b/drivers/sensors/apds9960.c
index 3d625b7149..65e5e200a2 100644
--- a/drivers/sensors/apds9960.c
+++ b/drivers/sensors/apds9960.c
@@ -131,12 +131,6 @@ static const struct file_operations g_apds9960_fops =
   NULL,            /* close */
   apds9960_read,   /* read */
   apds9960_write,  /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/as726x.c b/drivers/sensors/as726x.c
index 0d5b330b91..dac2599e1a 100644
--- a/drivers/sensors/as726x.c
+++ b/drivers/sensors/as726x.c
@@ -114,12 +114,6 @@ static const struct file_operations g_as726x_fops =
   NULL,                         /* close */
   as726x_read,                  /* read */
   as726x_write,                 /* write */
-  NULL,                         /* seek */
-  NULL,                         /* ioctl */
-  NULL                          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/bh1750fvi.c b/drivers/sensors/bh1750fvi.c
index b4a39a946e..5b0666f5c6 100644
--- a/drivers/sensors/bh1750fvi.c
+++ b/drivers/sensors/bh1750fvi.c
@@ -91,10 +91,6 @@ static const struct file_operations g_bh1750fvi_fops =
   bh1750fvi_write,  /* write */
   NULL,             /* seek */
   bh1750fvi_ioctl,  /* ioctl */
-  NULL              /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/bmg160.c b/drivers/sensors/bmg160.c
index 2ccc972295..811f8eebbd 100644
--- a/drivers/sensors/bmg160.c
+++ b/drivers/sensors/bmg160.c
@@ -98,12 +98,6 @@ static const struct file_operations g_bmg160_fops =
   bmg160_close,    /* close */
   bmg160_read,     /* read */
   bmg160_write,    /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /* Single linked list to store instances of drivers */
diff --git a/drivers/sensors/bmi160.c b/drivers/sensors/bmi160.c
index 7a220737a9..02319e3716 100644
--- a/drivers/sensors/bmi160.c
+++ b/drivers/sensors/bmi160.c
@@ -264,10 +264,6 @@ static const struct file_operations g_bmi160fops =
   NULL,            /* write */
   NULL,            /* seek */
   bmi160_ioctl,    /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/bmp180.c b/drivers/sensors/bmp180.c
index d70ede7374..a5f4bc0611 100644
--- a/drivers/sensors/bmp180.c
+++ b/drivers/sensors/bmp180.c
@@ -146,12 +146,6 @@ static const struct file_operations g_bmp180fops =
   NULL,                         /* close */
   bmp180_read,                  /* read */
   bmp180_write,                 /* write */
-  NULL,                         /* seek */
-  NULL,                         /* ioctl */
-  NULL                          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/dhtxx.c b/drivers/sensors/dhtxx.c
index 6706e34790..b97f1e5c17 100644
--- a/drivers/sensors/dhtxx.c
+++ b/drivers/sensors/dhtxx.c
@@ -113,12 +113,6 @@ static const struct file_operations g_dhtxxfops =
   NULL,         /* close */
   dhtxx_read,   /* read */
   dhtxx_write,  /* write */
-  NULL,         /* seek */
-  NULL,         /* ioctl */
-  NULL          /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL        /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/fxos8700cq.c b/drivers/sensors/fxos8700cq.c
index 7e4d510d78..21edd96869 100644
--- a/drivers/sensors/fxos8700cq.c
+++ b/drivers/sensors/fxos8700cq.c
@@ -110,13 +110,6 @@ static const struct file_operations g_fxos8700cqfops =
   fxos8700cq_open,    /* open */
   fxos8700cq_close,   /* close */
   fxos8700cq_read,    /* read */
-  NULL,               /* write */
-  NULL,               /* seek */
-  NULL,               /* ioctl */
-  NULL                /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL              /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/hall3ph.c b/drivers/sensors/hall3ph.c
index 20bb5c5b6c..452b1cb8c7 100644
--- a/drivers/sensors/hall3ph.c
+++ b/drivers/sensors/hall3ph.c
@@ -80,10 +80,6 @@ static const struct file_operations g_hall3ops =
   hall3_write, /* write */
   NULL,        /* seek */
   hall3_ioctl, /* ioctl */
-  NULL         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL       /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/hc_sr04.c b/drivers/sensors/hc_sr04.c
index 2b956b9140..1600119149 100644
--- a/drivers/sensors/hc_sr04.c
+++ b/drivers/sensors/hc_sr04.c
@@ -93,9 +93,6 @@ static const struct file_operations g_hcsr04ops =
   NULL,          /* truncate */
   NULL,          /* mmap */
   hcsr04_poll    /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/hts221.c b/drivers/sensors/hts221.c
index 18b6ee31b1..44e7c9a1f4 100644
--- a/drivers/sensors/hts221.c
+++ b/drivers/sensors/hts221.c
@@ -160,9 +160,6 @@ static const struct file_operations g_humidityops =
   NULL,          /* truncate */
   NULL,          /* mmap */
   hts221_poll    /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/ina219.c b/drivers/sensors/ina219.c
index 90d84b646f..2ad389ea93 100644
--- a/drivers/sensors/ina219.c
+++ b/drivers/sensors/ina219.c
@@ -115,12 +115,6 @@ static const struct file_operations g_ina219fops =
   ina219_close,    /* close */
   ina219_read,     /* read */
   ina219_write,    /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/ina226.c b/drivers/sensors/ina226.c
index d825b8e4e2..13cd3c2e76 100644
--- a/drivers/sensors/ina226.c
+++ b/drivers/sensors/ina226.c
@@ -97,12 +97,6 @@ static const struct file_operations g_ina226fops =
   ina226_close,    /* close */
   ina226_read,     /* read */
   ina226_write,    /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/ina3221.c b/drivers/sensors/ina3221.c
index 3718b47d66..dc663444b4 100644
--- a/drivers/sensors/ina3221.c
+++ b/drivers/sensors/ina3221.c
@@ -118,12 +118,6 @@ static const struct file_operations g_ina3221fops =
   NULL,            /* close */
   ina3221_read,    /* read */
   ina3221_write,   /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/isl29023.c b/drivers/sensors/isl29023.c
index 6d3af99a99..f7a24700e6 100644
--- a/drivers/sensors/isl29023.c
+++ b/drivers/sensors/isl29023.c
@@ -126,10 +126,6 @@ static const struct file_operations g_isl29023fops =
   isl29023_write,  /* write */
   NULL,            /* seek */
   isl29023_ioctl,  /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/kxtj9.c b/drivers/sensors/kxtj9.c
index 2bdc5ec0a5..e9d128ec74 100644
--- a/drivers/sensors/kxtj9.c
+++ b/drivers/sensors/kxtj9.c
@@ -165,10 +165,6 @@ static const struct file_operations g_fops =
   kxtj9_write,     /* write */
   NULL,            /* seek */
   kxtj9_ioctl,     /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/lis2dh.c b/drivers/sensors/lis2dh.c
index 445f9b9f42..554390cc4c 100644
--- a/drivers/sensors/lis2dh.c
+++ b/drivers/sensors/lis2dh.c
@@ -157,9 +157,6 @@ static const struct file_operations g_lis2dhops =
   NULL,          /* truncate */
   NULL,          /* mmap */
   lis2dh_poll    /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/lis3dh.c b/drivers/sensors/lis3dh.c
index f751eefe13..bc4de8ce1d 100644
--- a/drivers/sensors/lis3dh.c
+++ b/drivers/sensors/lis3dh.c
@@ -127,10 +127,6 @@ static const struct file_operations g_lis3dh_fops =
   lis3dh_write,    /* write */
   NULL,            /* seek */
   lis3dh_ioctl,    /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/lis3dsh.c b/drivers/sensors/lis3dsh.c
index 5ce9371f3f..68d97c2b41 100644
--- a/drivers/sensors/lis3dsh.c
+++ b/drivers/sensors/lis3dsh.c
@@ -103,12 +103,6 @@ static const struct file_operations g_lis3dsh_fops =
   lis3dsh_close,   /* close */
   lis3dsh_read,    /* read */
   lis3dsh_write,   /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /* Single linked list to store instances of drivers */
diff --git a/drivers/sensors/lis3mdl.c b/drivers/sensors/lis3mdl.c
index f4319b914d..cb59deeb71 100644
--- a/drivers/sensors/lis3mdl.c
+++ b/drivers/sensors/lis3mdl.c
@@ -104,12 +104,6 @@ static const struct file_operations g_lis3mdl_fops =
   lis3mdl_close,   /* close */
   lis3mdl_read,    /* read */
   lis3mdl_write,   /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /* Single linked list to store instances of drivers */
diff --git a/drivers/sensors/lm75.c b/drivers/sensors/lm75.c
index 6930a0a4d6..c4b14a75ba 100644
--- a/drivers/sensors/lm75.c
+++ b/drivers/sensors/lm75.c
@@ -102,10 +102,6 @@ static const struct file_operations g_lm75fops =
   lm75_write,      /* write */
   NULL,            /* seek */
   lm75_ioctl,      /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/lm92.c b/drivers/sensors/lm92.c
index 662b7e67ae..87e3abcc35 100644
--- a/drivers/sensors/lm92.c
+++ b/drivers/sensors/lm92.c
@@ -101,10 +101,6 @@ static const struct file_operations g_lm92fops =
   lm92_write,      /* write */
   NULL,            /* seek */
   lm92_ioctl,      /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/lps25h.c b/drivers/sensors/lps25h.c
index 74706b46a7..74e5294954 100644
--- a/drivers/sensors/lps25h.c
+++ b/drivers/sensors/lps25h.c
@@ -214,10 +214,6 @@ static const struct file_operations g_lps25hops =
   lps25h_write,  /* write */
   NULL,          /* seek */
   lps25h_ioctl,  /* ioctl */
-  NULL           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
- #endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/lsm303agr.c b/drivers/sensors/lsm303agr.c
index 2efc7a31dc..07f2b9c339 100644
--- a/drivers/sensors/lsm303agr.c
+++ b/drivers/sensors/lsm303agr.c
@@ -130,10 +130,6 @@ static const struct file_operations g_fops =
   lsm303agr_write,    /* write */
   NULL,               /* seek */
   lsm303agr_ioctl,    /* ioctl */
-  NULL                /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL              /* unlink */
-#endif
 };
 
 static const struct lsm303agr_ops_s g_lsm303agrsensor_ops =
diff --git a/drivers/sensors/lsm330_spi.c b/drivers/sensors/lsm330_spi.c
index 76c84785b1..69f3097b2d 100644
--- a/drivers/sensors/lsm330_spi.c
+++ b/drivers/sensors/lsm330_spi.c
@@ -148,10 +148,6 @@ static const struct file_operations g_lsm330a_fops =
   lsm330acl_write,     /* write */
   lsm330acl_seek,      /* seek */
   lsm330_ioctl,        /* ioctl */
-  NULL                 /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL               /* unlink */
-#endif
 };
 
 static const struct file_operations g_lsm330g_fops =
@@ -162,10 +158,6 @@ static const struct file_operations g_lsm330g_fops =
   lsm330gyro_write,    /* write */
   lsm330gyro_seek,     /* seek */
   lsm330_ioctl,        /* ioctl */
-  NULL                 /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL               /* unlink */
-#endif
 };
 
 static const struct lsm330spi_dvr_entry_vector_s g_lsm330acl_dops =
diff --git a/drivers/sensors/lsm6dsl.c b/drivers/sensors/lsm6dsl.c
index 4db852ded1..816d643ca8 100644
--- a/drivers/sensors/lsm6dsl.c
+++ b/drivers/sensors/lsm6dsl.c
@@ -138,10 +138,6 @@ static const struct file_operations g_fops =
   lsm6dsl_write,   /* write */
   NULL,            /* seek */
   lsm6dsl_ioctl,   /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 static const struct lsm6dsl_ops_s g_lsm6dsl_sensor_ops =
diff --git a/drivers/sensors/lsm9ds1.c b/drivers/sensors/lsm9ds1.c
index 66d0d0b87a..948f86dad4 100644
--- a/drivers/sensors/lsm9ds1.c
+++ b/drivers/sensors/lsm9ds1.c
@@ -588,10 +588,6 @@ static const struct file_operations g_fops =
   lsm9ds1_write,   /* write */
   NULL,            /* seek */
   lsm9ds1_ioctl,   /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 static const struct lsm9ds1_ops_s g_lsm9ds1accel_ops =
diff --git a/drivers/sensors/ltc4151.c b/drivers/sensors/ltc4151.c
index 879a921948..7830886da8 100644
--- a/drivers/sensors/ltc4151.c
+++ b/drivers/sensors/ltc4151.c
@@ -89,12 +89,6 @@ static const struct file_operations g_ltc4151fops =
   NULL,            /* close */
   ltc4151_read,    /* read */
   ltc4151_write,   /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/max31855.c b/drivers/sensors/max31855.c
index 7a5a164872..7dd4a6807b 100644
--- a/drivers/sensors/max31855.c
+++ b/drivers/sensors/max31855.c
@@ -92,12 +92,6 @@ static const struct file_operations g_max31855fops =
   NULL,            /* close */
   max31855_read,   /* read */
   max31855_write,  /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/max44009.c b/drivers/sensors/max44009.c
index 840c4bdcb8..7de5801722 100644
--- a/drivers/sensors/max44009.c
+++ b/drivers/sensors/max44009.c
@@ -115,9 +115,6 @@ static const struct file_operations g_alsops =
   NULL,            /* truncate */
   NULL,            /* mmap */
   max44009_poll    /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/max6675.c b/drivers/sensors/max6675.c
index d2c2a0e0f1..e54bbdb48c 100644
--- a/drivers/sensors/max6675.c
+++ b/drivers/sensors/max6675.c
@@ -88,12 +88,6 @@ static const struct file_operations g_max6675fops =
   NULL,            /* close */
   max6675_read,    /* read */
   max6675_write,   /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/mb7040.c b/drivers/sensors/mb7040.c
index 951ebc2c48..1e196f2c21 100644
--- a/drivers/sensors/mb7040.c
+++ b/drivers/sensors/mb7040.c
@@ -87,10 +87,6 @@ static const struct file_operations g_fops =
   mb7040_write,    /* write */
   NULL,            /* seek */
   mb7040_ioctl,    /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/mcp9844.c b/drivers/sensors/mcp9844.c
index 9d0960b5a8..c0f1b776e3 100644
--- a/drivers/sensors/mcp9844.c
+++ b/drivers/sensors/mcp9844.c
@@ -87,10 +87,6 @@ static const struct file_operations g_mcp9844_fops =
   mcp9844_write,   /* write */
   NULL,            /* seek */
   mcp9844_ioctl,   /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/mlx90393.c b/drivers/sensors/mlx90393.c
index 80eecdd0f3..6fdde2066b 100644
--- a/drivers/sensors/mlx90393.c
+++ b/drivers/sensors/mlx90393.c
@@ -102,12 +102,6 @@ static const struct file_operations g_mlx90393_fops =
   mlx90393_close,  /* close */
   mlx90393_read,   /* read */
   mlx90393_write,  /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /* Single linked list to store instances of drivers */
diff --git a/drivers/sensors/mlx90614.c b/drivers/sensors/mlx90614.c
index f05f6c946a..d83606a193 100644
--- a/drivers/sensors/mlx90614.c
+++ b/drivers/sensors/mlx90614.c
@@ -91,10 +91,6 @@ static const struct file_operations g_mlx90614_fops =
   mlx90614_write,  /* write */
   NULL,            /* seek */
   mlx90614_ioctl,  /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/mpl115a.c b/drivers/sensors/mpl115a.c
index 1888fc14dd..82198c24a0 100644
--- a/drivers/sensors/mpl115a.c
+++ b/drivers/sensors/mpl115a.c
@@ -87,12 +87,6 @@ static const struct file_operations g_mpl115afops =
   NULL,           /* close */
   mpl115a_read,   /* read */
   mpl115a_write,  /* write */
-  NULL,           /* seek */
-  NULL,           /* ioctl */
-  NULL            /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/mpu60x0.c b/drivers/sensors/mpu60x0.c
index e4b9f624bb..4472ca1f9c 100644
--- a/drivers/sensors/mpu60x0.c
+++ b/drivers/sensors/mpu60x0.c
@@ -267,11 +267,6 @@ static const struct file_operations g_mpu_fops =
   mpu_read,        /* read */
   mpu_write,       /* write */
   mpu_seek,        /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/ms58xx.c b/drivers/sensors/ms58xx.c
index 76006b081e..064bb1c966 100644
--- a/drivers/sensors/ms58xx.c
+++ b/drivers/sensors/ms58xx.c
@@ -159,10 +159,6 @@ static const struct file_operations g_fops =
   ms58xx_write,    /* write */
   NULL,            /* seek */
   ms58xx_ioctl,    /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/msa301.c b/drivers/sensors/msa301.c
index ec0190cdeb..d1a04b28b5 100644
--- a/drivers/sensors/msa301.c
+++ b/drivers/sensors/msa301.c
@@ -116,10 +116,6 @@ static const struct file_operations g_fops =
   msa301_write,    /* write */
   NULL,            /* seek */
   msa301_ioctl,    /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 static const struct msa301_ops_s g_msa301_sensor_ops =
diff --git a/drivers/sensors/qencoder.c b/drivers/sensors/qencoder.c
index 3dbe1a2077..53421622f1 100644
--- a/drivers/sensors/qencoder.c
+++ b/drivers/sensors/qencoder.c
@@ -88,10 +88,6 @@ static const struct file_operations g_qeops =
   qe_write, /* write */
   NULL,     /* seek */
   qe_ioctl, /* ioctl */
-  NULL      /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL    /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/sensor.c b/drivers/sensors/sensor.c
index 417554f063..1143592db1 100644
--- a/drivers/sensors/sensor.c
+++ b/drivers/sensors/sensor.c
@@ -170,9 +170,6 @@ static const struct file_operations g_sensor_fops =
   NULL,           /* truncate */
   NULL,           /* mmap */
   sensor_poll     /* poll  */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/t67xx.c b/drivers/sensors/t67xx.c
index 8d8a5d3d35..cdcea8beb2 100644
--- a/drivers/sensors/t67xx.c
+++ b/drivers/sensors/t67xx.c
@@ -155,10 +155,6 @@ static const struct file_operations g_t67xxfops =
   t67xx_write,    /* write */
   NULL,           /* seek */
   t67xx_ioctl,    /* ioctl */
-  NULL            /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/veml6070.c b/drivers/sensors/veml6070.c
index d386c0aaa0..47be8afb7b 100644
--- a/drivers/sensors/veml6070.c
+++ b/drivers/sensors/veml6070.c
@@ -86,12 +86,6 @@ static const struct file_operations g_veml6070_fops =
   NULL,            /* close */
   veml6070_read,   /* read */
   veml6070_write,  /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/vl53l1x.c b/drivers/sensors/vl53l1x.c
index 0d5f259abc..c9177d7668 100644
--- a/drivers/sensors/vl53l1x.c
+++ b/drivers/sensors/vl53l1x.c
@@ -248,10 +248,6 @@ static const struct file_operations g_vl53l1xfops =
   vl53l1x_write,        /* write */
   NULL,                 /* seek */
   vl53l1x_ioctl,        /* ioctl */
-  NULL                  /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/xen1210.c b/drivers/sensors/xen1210.c
index a05e82dff1..9124fefaa1 100644
--- a/drivers/sensors/xen1210.c
+++ b/drivers/sensors/xen1210.c
@@ -62,13 +62,6 @@ static const struct file_operations g_xen1210fops =
   NULL,            /* open */
   NULL,            /* close */
   xen1210_read,    /* read */
-  NULL,            /* write */
-  NULL,            /* seek */
-  NULL,            /* ioctl */
-  NULL             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL           /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/sensors/zerocross.c b/drivers/sensors/zerocross.c
index 6a43bfebbe..6ff67b670c 100644
--- a/drivers/sensors/zerocross.c
+++ b/drivers/sensors/zerocross.c
@@ -113,10 +113,6 @@ static const struct file_operations g_zcops =
   zc_write,  /* write */
   NULL,      /* seek */
   zc_ioctl,  /* ioctl */
-  NULL       /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL     /* unlink */
-#endif
 };
 
 volatile int sample = 0;
diff --git a/drivers/serial/ptmx.c b/drivers/serial/ptmx.c
index e54cd2a277..6af2e7c56b 100644
--- a/drivers/serial/ptmx.c
+++ b/drivers/serial/ptmx.c
@@ -88,12 +88,6 @@ static const struct file_operations g_ptmx_fops =
   NULL,          /* close */
   ptmx_read,     /* read */
   ptmx_write,    /* write */
-  NULL,          /* seek */
-  NULL,          /* ioctl */
-  NULL           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 static struct ptmx_dev_s g_ptmx =
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 48c8dc069a..0fdabee16e 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -129,9 +129,6 @@ static const struct file_operations g_serialops =
   NULL,       /* truncate */
   NULL,       /* mmap */
   uart_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL      /* unlink */
-#endif
 };
 
 #ifdef CONFIG_TTY_LAUNCH
diff --git a/drivers/serial/uart_bth4.c b/drivers/serial/uart_bth4.c
index 08421df006..97e9717ae3 100644
--- a/drivers/serial/uart_bth4.c
+++ b/drivers/serial/uart_bth4.c
@@ -93,9 +93,6 @@ static const struct file_operations g_uart_bth4_ops =
   NULL,             /* truncate */
   NULL,             /* mmap */
   uart_bth4_poll    /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/syslog/ramlog.c b/drivers/syslog/ramlog.c
index 5019cf231f..b87765e24d 100644
--- a/drivers/syslog/ramlog.c
+++ b/drivers/syslog/ramlog.c
@@ -117,9 +117,6 @@ static const struct file_operations g_ramlogfops =
   NULL,              /* truncate */
   NULL,              /* mmap */
   ramlog_file_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL             /* unlink */
-#endif
 };
 
 /* This is the pre-allocated buffer used for the console RAM log and/or
diff --git a/drivers/syslog/syslog_chardev.c b/drivers/syslog/syslog_chardev.c
index 08c5503fcd..bec352226c 100644
--- a/drivers/syslog/syslog_chardev.c
+++ b/drivers/syslog/syslog_chardev.c
@@ -54,12 +54,6 @@ static const struct file_operations syslog_fops =
   NULL,                 /* close */
   NULL,                 /* read */
   syslog_chardev_write, /* write */
-  NULL,                 /* seek */
-  NULL,                 /* ioctl */
-  NULL                  /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/syslog/syslog_console.c b/drivers/syslog/syslog_console.c
index 91e95899e3..5d04c6d58d 100644
--- a/drivers/syslog/syslog_console.c
+++ b/drivers/syslog/syslog_console.c
@@ -53,12 +53,6 @@ static const struct file_operations g_consoleops =
   NULL,                 /* close */
   syslog_console_read,  /* read */
   syslog_console_write, /* write */
-  NULL,                 /* seek */
-  NULL,                 /* ioctl */
-  NULL                  /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/syslog/syslog_rpmsg.c b/drivers/syslog/syslog_rpmsg.c
index f4337e46f7..73d5c63c86 100644
--- a/drivers/syslog/syslog_rpmsg.c
+++ b/drivers/syslog/syslog_rpmsg.c
@@ -107,12 +107,6 @@ static const struct file_operations g_syslog_rpmsgfops =
   NULL,                    /* close */
   syslog_rpmsg_file_read,  /* read */
   syslog_rpmsg_file_write, /* write */
-  NULL,                    /* seek */
-  NULL,                    /* ioctl */
-  NULL                     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                   /* unlink */
-#endif
 };
 #endif
 
diff --git a/drivers/syslog/syslog_rpmsg_server.c b/drivers/syslog/syslog_rpmsg_server.c
index 423072334c..f4e82392f1 100644
--- a/drivers/syslog/syslog_rpmsg_server.c
+++ b/drivers/syslog/syslog_rpmsg_server.c
@@ -94,10 +94,6 @@ static const struct file_operations g_syslog_rpmsg_fops =
   NULL,                    /* write */
   NULL,                    /* seek */
   syslog_rpmsg_file_ioctl, /* ioctl */
-  NULL                     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                   /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/timers/capture.c b/drivers/timers/capture.c
index 0b5f41e643..194100db0d 100644
--- a/drivers/timers/capture.c
+++ b/drivers/timers/capture.c
@@ -88,10 +88,6 @@ static const struct file_operations g_capops =
   cap_write, /* write */
   NULL,      /* seek */
   cap_ioctl, /* ioctl */
-  NULL,      /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  NULL       /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/timers/oneshot.c b/drivers/timers/oneshot.c
index c4b20ab244..2a0f4b25ae 100644
--- a/drivers/timers/oneshot.c
+++ b/drivers/timers/oneshot.c
@@ -83,10 +83,6 @@ static const struct file_operations g_oneshot_ops =
   oneshot_write, /* write */
   NULL,          /* seek */
   oneshot_ioctl, /* ioctl */
-  NULL           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/timers/pwm.c b/drivers/timers/pwm.c
index f2d8561c0a..b6b3be36a1 100644
--- a/drivers/timers/pwm.c
+++ b/drivers/timers/pwm.c
@@ -101,10 +101,6 @@ static const struct file_operations g_pwmops =
   pwm_write, /* write */
   NULL,      /* seek */
   pwm_ioctl, /* ioctl */
-  NULL       /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL     /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/timers/timer.c b/drivers/timers/timer.c
index 9dc90e4f7f..4777199282 100644
--- a/drivers/timers/timer.c
+++ b/drivers/timers/timer.c
@@ -90,10 +90,6 @@ static const struct file_operations g_timerops =
   timer_write, /* write */
   NULL,        /* seek */
   timer_ioctl, /* ioctl */
-  NULL         /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL       /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/timers/watchdog.c b/drivers/timers/watchdog.c
index ac93658331..c5f3d15f0f 100644
--- a/drivers/timers/watchdog.c
+++ b/drivers/timers/watchdog.c
@@ -124,10 +124,6 @@ static const struct file_operations g_wdogops =
   wdog_write, /* write */
   NULL,       /* seek */
   wdog_ioctl, /* ioctl */
-  NULL        /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL      /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/usbdev/adb.c b/drivers/usbdev/adb.c
index 42ec3d5a2e..0639df30c7 100755
--- a/drivers/usbdev/adb.c
+++ b/drivers/usbdev/adb.c
@@ -257,9 +257,6 @@ static const struct file_operations g_adb_fops =
   NULL,           /* truncate */
   NULL,           /* mmap */
   adb_char_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /* USB descriptor ***********************************************************/
diff --git a/drivers/usbhost/usbhost_cdcmbim.c b/drivers/usbhost/usbhost_cdcmbim.c
index fb63be6588..9483483583 100644
--- a/drivers/usbhost/usbhost_cdcmbim.c
+++ b/drivers/usbhost/usbhost_cdcmbim.c
@@ -350,9 +350,6 @@ static const struct file_operations cdcwdm_fops =
   NULL,          /* truncate */
   NULL,          /* mmap */
   cdcwdm_poll    /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /* This is a bitmap that is used to allocate device names /dev/cdc-wdm[n]. */
diff --git a/drivers/usbhost/usbhost_hidkbd.c b/drivers/usbhost/usbhost_hidkbd.c
index 53690b986b..bd470ccdea 100644
--- a/drivers/usbhost/usbhost_hidkbd.c
+++ b/drivers/usbhost/usbhost_hidkbd.c
@@ -344,9 +344,6 @@ static const struct file_operations g_hidkbd_fops =
   NULL,                     /* truncate */
   NULL,                     /* mmap */
   usbhost_poll              /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                    /* unlink */
-#endif
 };
 
 /* This is a bitmap that is used to allocate device names /dev/kbda-z. */
diff --git a/drivers/usbhost/usbhost_hidmouse.c b/drivers/usbhost/usbhost_hidmouse.c
index a7b430e846..8b1351bb71 100644
--- a/drivers/usbhost/usbhost_hidmouse.c
+++ b/drivers/usbhost/usbhost_hidmouse.c
@@ -394,9 +394,6 @@ static const struct file_operations g_hidmouse_fops =
   NULL,                    /* truncate */
   NULL,                    /* mmap */
   usbhost_poll             /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                   /* unlink */
-#endif
 };
 
 /* This is a bitmap that is used to allocate device names /dev/mouse0-31. */
diff --git a/drivers/usbhost/usbhost_xboxcontroller.c b/drivers/usbhost/usbhost_xboxcontroller.c
index 0a467f58fd..0cb83a238c 100644
--- a/drivers/usbhost/usbhost_xboxcontroller.c
+++ b/drivers/usbhost/usbhost_xboxcontroller.c
@@ -299,9 +299,6 @@ static const struct file_operations g_xboxcontroller_fops =
   NULL,                     /* truncate */
   NULL,                     /* mmap */
   usbhost_poll              /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                    /* unlink */
-#endif
 };
 
 /* This is a bitmap that is used to allocate device names /dev/xboxa-z. */
diff --git a/drivers/usbmisc/fusb301.c b/drivers/usbmisc/fusb301.c
index a64d77d3d6..12db5b430d 100644
--- a/drivers/usbmisc/fusb301.c
+++ b/drivers/usbmisc/fusb301.c
@@ -97,9 +97,6 @@ static const struct file_operations g_fusb301ops =
   NULL,          /* truncate */
   NULL,          /* mmap */
   fusb301_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/usbmisc/fusb303.c b/drivers/usbmisc/fusb303.c
index d64b5055c3..b90cde4640 100644
--- a/drivers/usbmisc/fusb303.c
+++ b/drivers/usbmisc/fusb303.c
@@ -131,9 +131,6 @@ static const struct file_operations g_fusb303ops =
   NULL,          /* truncate */
   NULL,          /* mmap */
   fusb303_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/usrsock/usrsock_dev.c b/drivers/usrsock/usrsock_dev.c
index 9bf410a24c..cdefc5e70b 100644
--- a/drivers/usrsock/usrsock_dev.c
+++ b/drivers/usrsock/usrsock_dev.c
@@ -106,9 +106,6 @@ static const struct file_operations g_usrsockdevops =
   NULL,               /* truncate */
   NULL,               /* mmap */
   usrsockdev_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL              /* unlink */
-#endif
 };
 
 static struct usrsockdev_s g_usrsockdev =
diff --git a/drivers/video/fb.c b/drivers/video/fb.c
index 6edc13dc17..bea9c54d65 100644
--- a/drivers/video/fb.c
+++ b/drivers/video/fb.c
@@ -91,9 +91,6 @@ static const struct file_operations fb_fops =
   NULL,          /* truncate */
   fb_mmap,       /* mmap */
   fb_poll        /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/video/max7456.c b/drivers/video/max7456.c
index c1dd97121a..d5bd1bbb78 100644
--- a/drivers/video/max7456.c
+++ b/drivers/video/max7456.c
@@ -338,9 +338,6 @@ static const struct file_operations g_mx7_fops =
   NULL,          /* seek */
   NULL,          /* ioctl */
   NULL           /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 #if defined(DEBUG)
@@ -353,12 +350,6 @@ static const struct file_operations g_mx7_debug_fops =
   NULL,                /* close */
   mx7_debug_read,      /* read */
   mx7_debug_write,     /* write */
-  NULL,                /* seek */
-  NULL,                /* ioctl */
-  NULL                 /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL               /* unlink */
-#endif
 };
 #endif
 
diff --git a/drivers/video/video.c b/drivers/video/video.c
index f6d07e9998..2309909c89 100644
--- a/drivers/video/video.c
+++ b/drivers/video/video.c
@@ -289,10 +289,6 @@ static const struct file_operations g_video_fops =
   video_ioctl,              /* ioctl */
   NULL,                     /* truncate */
   video_mmap,               /* mmap */
-  NULL                      /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                    /* unlink */
-#endif
 };
 
 static bool g_video_initialized = false;
diff --git a/drivers/wireless/cc1101.c b/drivers/wireless/cc1101.c
index 496f9b4dd1..a3fcc638c4 100644
--- a/drivers/wireless/cc1101.c
+++ b/drivers/wireless/cc1101.c
@@ -308,9 +308,6 @@ static const struct file_operations g_cc1101ops =
   NULL,              /* truncate */
   NULL,              /* mmap */
   cc1101_file_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL             /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/wireless/gs2200m.c b/drivers/wireless/gs2200m.c
index 8c1dc3647d..2d5f193dd4 100644
--- a/drivers/wireless/gs2200m.c
+++ b/drivers/wireless/gs2200m.c
@@ -234,9 +234,6 @@ static const struct file_operations g_gs2200m_fops =
   NULL,          /* truncate */
   NULL,          /* mmap */
   gs2200m_poll   /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
-#endif
 };
 
 static struct evt_code_s _evt_table[] =
diff --git a/drivers/wireless/lpwan/sx127x/sx127x.c b/drivers/wireless/lpwan/sx127x/sx127x.c
index 8c2f898c47..f6862cab20 100644
--- a/drivers/wireless/lpwan/sx127x/sx127x.c
+++ b/drivers/wireless/lpwan/sx127x/sx127x.c
@@ -454,9 +454,6 @@ static const struct file_operations sx127x_fops =
   NULL,           /* truncate */
   NULL,           /* mmap */
   sx127x_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL          /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/drivers/wireless/nrf24l01.c b/drivers/wireless/nrf24l01.c
index 44973dae65..3bf57677e9 100644
--- a/drivers/wireless/nrf24l01.c
+++ b/drivers/wireless/nrf24l01.c
@@ -242,9 +242,6 @@ static const struct file_operations nrf24l01_fops =
   NULL,             /* truncate */
   NULL,             /* mmap */
   nrf24l01_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/fs/mount/fs_automount.c b/fs/mount/fs_automount.c
index 8b35d231c0..fd6dd81399 100644
--- a/fs/mount/fs_automount.c
+++ b/fs/mount/fs_automount.c
@@ -144,10 +144,6 @@ static const struct file_operations automount_fops =
   NULL,                 /* write */
   NULL,                 /* seek */
   automount_ioctl,      /* ioctl */
-  NULL                  /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                /* unlink */
-#endif
 };
 #endif /* CONFIG_FS_AUTOMOUNTER_DRIVER */
 
diff --git a/fs/mqueue/mq_open.c b/fs/mqueue/mq_open.c
index d6c9647bcf..204e45a7ee 100644
--- a/fs/mqueue/mq_open.c
+++ b/fs/mqueue/mq_open.c
@@ -63,9 +63,6 @@ static const struct file_operations g_nxmq_fileops =
   NULL,             /* truncate */
   NULL,             /* mmap */
   nxmq_file_poll    /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 /****************************************************************************
diff --git a/fs/socket/socket.c b/fs/socket/socket.c
index 30c5716b76..aff1dcf4bd 100644
--- a/fs/socket/socket.c
+++ b/fs/socket/socket.c
@@ -67,9 +67,6 @@ static const struct file_operations g_sock_fileops =
   NULL,             /* truncate */
   NULL,             /* mmap */
   sock_file_poll    /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 static struct inode g_sock_inode =
diff --git a/fs/vfs/fs_dir.c b/fs/vfs/fs_dir.c
index ee335e8efc..243116ad06 100644
--- a/fs/vfs/fs_dir.c
+++ b/fs/vfs/fs_dir.c
@@ -71,10 +71,6 @@ static const struct file_operations g_dir_fileops =
   NULL,       /* write */
   dir_seek,   /* seek */
   dir_ioctl,  /* ioctl */
-  NULL,       /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  NULL,       /* unlink */
-#endif
 };
 
 static struct inode g_dir_inode =
diff --git a/fs/vfs/fs_epoll.c b/fs/vfs/fs_epoll.c
index 18450c2798..964d90e1b1 100644
--- a/fs/vfs/fs_epoll.c
+++ b/fs/vfs/fs_epoll.c
@@ -107,9 +107,6 @@ static const struct file_operations g_epoll_ops =
   NULL,             /* truncate */
   NULL,             /* mmap */
   epoll_do_poll     /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
-#endif
 };
 
 static struct inode g_epoll_inode =
diff --git a/fs/vfs/fs_eventfd.c b/fs/vfs/fs_eventfd.c
index 4b2769d900..50ccd4e2af 100644
--- a/fs/vfs/fs_eventfd.c
+++ b/fs/vfs/fs_eventfd.c
@@ -104,11 +104,6 @@ static const struct file_operations g_eventfd_fops =
   NULL,             /* mmap */
 #ifdef CONFIG_EVENT_FD_POLL
   eventfd_do_poll   /* poll */
-#else
-  NULL              /* poll */
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL            /* unlink */
 #endif
 };
 
diff --git a/fs/vfs/fs_signalfd.c b/fs/vfs/fs_signalfd.c
index 8c26ba8481..bd5ddd3cd5 100644
--- a/fs/vfs/fs_signalfd.c
+++ b/fs/vfs/fs_signalfd.c
@@ -82,9 +82,6 @@ static const struct file_operations g_signalfd_fileops =
   NULL,                 /* truncate */
   NULL,                 /* mmap */
   signalfd_file_poll    /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL                /* unlink */
-#endif
 };
 
 static struct inode g_signalfd_inode =
diff --git a/fs/vfs/fs_timerfd.c b/fs/vfs/fs_timerfd.c
index 639ab63a7b..01cadb57c6 100644
--- a/fs/vfs/fs_timerfd.c
+++ b/fs/vfs/fs_timerfd.c
@@ -113,11 +113,6 @@ static const struct file_operations g_timerfd_fops =
   NULL,          /* ioctl */
 #ifdef CONFIG_TIMER_FD_POLL
   timerfd_poll   /* poll */
-#else
-  NULL           /* poll */
-#endif
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL         /* unlink */
 #endif
 };
 
diff --git a/wireless/ieee802154/mac802154_device.c b/wireless/ieee802154/mac802154_device.c
index 965aeea004..3dea80b768 100644
--- a/wireless/ieee802154/mac802154_device.c
+++ b/wireless/ieee802154/mac802154_device.c
@@ -144,10 +144,6 @@ static const struct file_operations mac802154dev_fops =
   mac802154dev_write, /* write */
   NULL,               /* seek */
   mac802154dev_ioctl, /* ioctl */
-  NULL                /* poll */
-#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
-  , NULL               /* unlink */
-#endif
 };
 
 /****************************************************************************