fs/inode: remove all unnecessary check for filep/inode

Since VFS layer already contains sanity checks, so remove unnecessary lower half checks

Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an
2023-08-28 17:17:05 +08:00
committed by Xiang Xiao
parent baabf4bbf3
commit 7aa45305b7
158 changed files with 412 additions and 714 deletions
+5 -5
View File
@@ -823,7 +823,7 @@ static int cxd56_emmc_open(struct inode *inode)
struct cxd56_emmc_state_s *priv;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct cxd56_emmc_state_s *)inode->i_private;
/* Just increment the reference count on the driver */
@@ -844,7 +844,7 @@ static int cxd56_emmc_close(struct inode *inode)
struct cxd56_emmc_state_s *priv;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct cxd56_emmc_state_s *)inode->i_private;
/* Decrement the reference count on the block driver */
@@ -868,7 +868,7 @@ static ssize_t cxd56_emmc_read(struct inode *inode,
struct cxd56_emmc_state_s *priv;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct cxd56_emmc_state_s *)inode->i_private;
finfo("Read sector %" PRIuOFF " (%u sectors) to %p\n",
@@ -893,7 +893,7 @@ static ssize_t cxd56_emmc_write(struct inode *inode,
struct cxd56_emmc_state_s *priv;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct cxd56_emmc_state_s *)inode->i_private;
finfo("Write %p to sector %" PRIu32 " (%u sectors)\n", buffer,
@@ -915,7 +915,7 @@ static int cxd56_emmc_geometry(struct inode *inode,
{
struct cxd56_emmc_state_s *priv;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct cxd56_emmc_state_s *)inode->i_private;
memset(geometry, 0, sizeof(*geometry));
-4
View File
@@ -198,7 +198,6 @@ static int hif_open(struct file *filep)
struct inode *inode;
struct cxd56_hifdev_s *priv;
DEBUGASSERT(filep && filep->f_inode);
inode = filep->f_inode;
priv = (struct cxd56_hifdev_s *)inode->i_private;
@@ -253,7 +252,6 @@ static int hif_close(struct file *filep)
struct inode *inode;
struct cxd56_hifdev_s *priv;
DEBUGASSERT(filep && filep->f_inode);
inode = filep->f_inode;
priv = (struct cxd56_hifdev_s *)inode->i_private;
@@ -281,7 +279,6 @@ static ssize_t hif_read(struct file *filep, char *buffer, size_t len)
struct cxd56_hifdev_s *priv;
int ret;
DEBUGASSERT(filep && filep->f_inode);
inode = filep->f_inode;
priv = (struct cxd56_hifdev_s *)inode->i_private;
@@ -313,7 +310,6 @@ static ssize_t hif_write(struct file *filep,
struct cxd56_hifdev_s *priv;
int ret;
DEBUGASSERT(filep && filep->f_inode);
inode = filep->f_inode;
priv = (struct cxd56_hifdev_s *)inode->i_private;
+1 -1
View File
@@ -553,7 +553,7 @@ static ssize_t cxd56_powermgr_procfs_read(struct file *filep,
pminfo("READ buffer=%p buflen=%lu len=%lu\n", buffer,
(unsigned long)buflen, g_powermg_procfs_len);
DEBUGASSERT(filep && filep->f_priv);
DEBUGASSERT(filep->f_priv);
priv = (struct cxd56_powermgr_procfs_file_s *)filep->f_priv;
-1
View File
@@ -534,7 +534,6 @@ static int efm32_ioctl(struct file *filep, int cmd, unsigned long arg)
struct efm32_leuart_s *priv;
int ret = OK;
DEBUGASSERT(filep, filep->f_inode);
inode = filep->f_inode;
dev = inode->i_private;
-3
View File
@@ -804,9 +804,6 @@ static int efm32_ioctl(struct file *filep, int cmd, unsigned long arg)
int ret = OK;
DEBUGASSERT(filep);
DEBUGASSERT(filep->f_inode);
inode = filep->f_inode;
dev = inode->i_private;
-1
View File
@@ -1114,7 +1114,6 @@ static int kinetis_ioctl(struct file *filep, int cmd, unsigned long arg)
#if defined(CONFIG_SERIAL_TERMIOS) || defined(CONFIG_SERIAL_TIOCSERGSTRUCT) || \
defined(CONFIG_KINETIS_SERIALBRK_BSDCOMPAT)
DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
inode = filep->f_inode;
dev = inode->i_private;
DEBUGASSERT(dev != NULL && dev->priv != NULL);
-1
View File
@@ -1277,7 +1277,6 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
struct up_dev_s *priv;
int ret = OK;
DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
inode = filep->f_inode;
dev = inode->i_private;
DEBUGASSERT(dev != NULL && dev->priv != NULL);
-1
View File
@@ -586,7 +586,6 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
struct up_dev_s *priv;
int ret = OK;
DEBUGASSERT(filep, filep->f_inode);
inode = filep->f_inode;
dev = inode->i_private;
+3 -4
View File
@@ -131,7 +131,7 @@ static ssize_t mmcl_read(struct inode *inode, unsigned char *buffer,
finfo("sector: %" PRIuOFF " nsectors: %u\n", start_sector, nsectors);
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = (struct mmcl_dev_s *)inode->i_private;
nread = MTD_BREAD(dev->mtd, start_sector, nsectors, buffer);
@@ -161,7 +161,7 @@ static ssize_t mmcl_write(struct inode *inode,
finfo("sector: %" PRIuOFF " nsectors: %u\n", start_sector, nsectors);
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = (struct mmcl_dev_s *)inode->i_private;
nwrite = MTD_BWRITE(dev->mtd, start_sector, nsectors, buffer);
@@ -188,7 +188,6 @@ static int mmcl_geometry(struct inode *inode, struct geometry *geometry)
finfo("Entry\n");
DEBUGASSERT(inode);
if (geometry)
{
dev = (struct mmcl_dev_s *)inode->i_private;
@@ -226,7 +225,7 @@ static int mmcl_ioctl(struct inode *inode, int cmd, unsigned long arg)
int ret;
finfo("Entry\n");
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = (struct mmcl_dev_s *)inode->i_private;
ret = MTD_IOCTL(dev->mtd, cmd, arg);
-1
View File
@@ -1128,7 +1128,6 @@ static int lpc54_ioctl(struct file *filep, int cmd, unsigned long arg)
struct lpc54_dev_s *priv;
int ret = OK;
DEBUGASSERT(filep, filep->f_inode);
inode = filep->f_inode;
dev = inode->i_private;
@@ -563,7 +563,6 @@ static int max326_ioctl(struct file *filep, int cmd, unsigned long arg)
struct max326_dev_s *priv;
int ret = OK;
DEBUGASSERT(filep, filep->f_inode);
inode = filep->f_inode;
dev = inode->i_private;
-2
View File
@@ -608,7 +608,6 @@ static ssize_t phyplus_stub_write(struct file *filep,
int ret = 0;
static int cmd_pos = 0;
DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
inode = filep->f_inode;
DEBUGASSERT(inode->i_private != NULL);
@@ -696,7 +695,6 @@ static int phyplus_stub_ioctl(struct file *filep, int cmd,
* int j = 0;
*/
DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
inode = filep->f_inode;
DEBUGASSERT(inode->i_private != NULL);
+6 -7
View File
@@ -156,7 +156,7 @@ static int eeed_open(struct inode *inode)
{
struct eeed_struct_s *dev;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = (struct eeed_struct_s *)inode->i_private;
/* Increment the open reference count */
@@ -181,7 +181,7 @@ static int eeed_close(struct inode *inode)
{
struct eeed_struct_s *dev;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = (struct eeed_struct_s *)inode->i_private;
/* Increment the open reference count */
@@ -206,7 +206,7 @@ static ssize_t eeed_read(struct inode *inode, unsigned char *buffer,
{
struct eeed_struct_s *dev;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = (struct eeed_struct_s *)inode->i_private;
finfo("sector: %" PRIu64 " nsectors: %u sectorsize: %d\n",
@@ -243,7 +243,7 @@ static ssize_t eeed_write(struct inode *inode,
{
struct eeed_struct_s *dev;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = (struct eeed_struct_s *)inode->i_private;
finfo("sector: %" PRIu64 " nsectors: %u sectorsize: %d\n",
@@ -288,7 +288,6 @@ static int eeed_geometry(struct inode *inode, struct geometry *geometry)
finfo("Entry\n");
DEBUGASSERT(inode);
if (geometry)
{
dev = (struct eeed_struct_s *)inode->i_private;
@@ -329,7 +328,7 @@ static int eeed_ioctl(struct inode *inode, int cmd, unsigned long arg)
/* Only one ioctl command is supported */
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
if (cmd == BIOC_XIPBASE && ppv)
{
dev = (struct eeed_struct_s *)inode->i_private;
@@ -355,7 +354,7 @@ static int eeed_unlink(struct inode *inode)
{
struct eeed_struct_s *dev;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = (struct eeed_struct_s *)inode->i_private;
/* And free the block driver itself */
+4 -6
View File
@@ -970,10 +970,9 @@ static ssize_t sam_tsd_read(struct file *filep, char *buffer, size_t len)
int ret;
iinfo("buffer:%p len:%d\n", buffer, len);
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct sam_tsd_s *)inode->i_private;
/* Verify that the caller has provided a buffer large enough to receive
@@ -1105,10 +1104,9 @@ static int sam_tsd_ioctl(struct file *filep, int cmd, unsigned long arg)
int regval;
iinfo("cmd: %d arg: %ld\n", cmd, arg);
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct sam_tsd_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -1164,10 +1162,10 @@ static int sam_tsd_poll(struct file *filep, struct pollfd *fds, bool setup)
int i;
iinfo("setup: %d\n", (int)setup);
DEBUGASSERT(filep && fds);
DEBUGASSERT(fds);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct sam_tsd_s *)inode->i_private;
/* Get exclusive access to the ADC hardware */
+7 -7
View File
@@ -254,7 +254,7 @@ static int stm32_bbsram_open(struct file *filep)
struct stm32_bbsram_s *bbr;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
/* Increment the reference count */
@@ -309,7 +309,7 @@ static int stm32_bbsram_close(struct file *filep)
struct stm32_bbsram_s *bbr;
int ret = OK;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = nxmutex_lock(&bbr->lock);
@@ -357,7 +357,7 @@ static off_t stm32_bbsram_seek(struct file *filep, off_t offset,
off_t newpos;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = nxmutex_lock(&bbr->lock);
@@ -427,7 +427,7 @@ static ssize_t stm32_bbsram_read(struct file *filep, char *buffer,
struct stm32_bbsram_s *bbr;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = nxmutex_lock(&bbr->lock);
@@ -473,7 +473,7 @@ static ssize_t stm32_bbsram_write(struct file *filep,
struct stm32_bbsram_s *bbr;
int ret = -EFBIG;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
/* Forbid writes past the end of the device */
@@ -537,7 +537,7 @@ static int stm32_bbsram_ioctl(struct file *filep, int cmd,
struct stm32_bbsram_s *bbr;
int ret = -ENOTTY;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
if (cmd == STM32_BBSRAM_GETDESC_IOCTL)
@@ -590,7 +590,7 @@ static int stm32_bbsram_unlink(struct inode *inode)
struct stm32_bbsram_s *bbr;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = nxmutex_lock(&bbr->lock);
+7 -7
View File
@@ -254,7 +254,7 @@ static int stm32_bbsram_open(struct file *filep)
struct stm32_bbsram_s *bbr;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
/* Increment the reference count */
@@ -309,7 +309,7 @@ static int stm32_bbsram_close(struct file *filep)
struct stm32_bbsram_s *bbr;
int ret = OK;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = nxmutex_lock(&bbr->lock);
@@ -357,7 +357,7 @@ static off_t stm32_bbsram_seek(struct file *filep, off_t offset,
off_t newpos;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = nxmutex_lock(&bbr->lock);
@@ -427,7 +427,7 @@ static ssize_t stm32_bbsram_read(struct file *filep, char *buffer,
struct stm32_bbsram_s *bbr;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = nxmutex_lock(&bbr->lock);
@@ -473,7 +473,7 @@ static ssize_t stm32_bbsram_write(struct file *filep,
struct stm32_bbsram_s *bbr;
int ret = -EFBIG;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
/* Forbid writes past the end of the device */
@@ -537,7 +537,7 @@ static int stm32_bbsram_ioctl(struct file *filep, int cmd,
struct stm32_bbsram_s *bbr;
int ret = -ENOTTY;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
if (cmd == STM32F7_BBSRAM_GETDESC_IOCTL)
@@ -590,7 +590,7 @@ static int stm32_bbsram_unlink(struct inode *inode)
struct stm32_bbsram_s *bbr;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = nxmutex_lock(&bbr->lock);
+7 -7
View File
@@ -300,7 +300,7 @@ static int stm32_bbsram_open(struct file *filep)
struct stm32_bbsram_s *bbr;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
/* Increment the reference count */
@@ -355,7 +355,7 @@ static int stm32_bbsram_close(struct file *filep)
struct stm32_bbsram_s *bbr;
int ret = OK;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = nxmutex_lock(&bbr->lock);
@@ -403,7 +403,7 @@ static off_t stm32_bbsram_seek(struct file *filep, off_t offset,
off_t newpos;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = nxmutex_lock(&bbr->lock);
@@ -473,7 +473,7 @@ static ssize_t stm32_bbsram_read(struct file *filep, char *buffer,
struct stm32_bbsram_s *bbr;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = nxmutex_lock(&bbr->lock);
@@ -520,7 +520,7 @@ static ssize_t stm32_bbsram_write(struct file *filep,
struct stm32_bbsram_s *bbr;
int ret = -EFBIG;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
/* Forbid writes past the end of the device */
@@ -584,7 +584,7 @@ static int stm32_bbsram_ioctl(struct file *filep, int cmd,
struct stm32_bbsram_s *bbr;
int ret = -ENOTTY;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
if (cmd == STM32H7_BBSRAM_GETDESC_IOCTL)
@@ -637,7 +637,7 @@ static int stm32_bbsram_unlink(struct inode *inode)
struct stm32_bbsram_s *bbr;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct stm32_bbsram_s *)inode->i_private;
ret = nxmutex_lock(&bbr->lock);
-1
View File
@@ -802,7 +802,6 @@ static int xmc4_ioctl(struct file *filep, int cmd, unsigned long arg)
struct xmc4_dev_s *priv;
int ret = OK;
DEBUGASSERT(filep, filep->f_inode);
inode = filep->f_inode;
dev = inode->i_private;
-1
View File
@@ -491,7 +491,6 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
struct up_dev_s *priv;
int ret = OK;
DEBUGASSERT(filep, filep->f_inode);
inode = filep->f_inode;
dev = inode->i_private;
-1
View File
@@ -564,7 +564,6 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
struct up_dev_s *priv;
int ret = OK;
DEBUGASSERT(filep, filep->f_inode);
inode = filep->f_inode;
dev = inode->i_private;
+7 -7
View File
@@ -206,7 +206,7 @@ static int rx65n_sbram_open(struct file *filep)
struct inode *inode = filep->f_inode;
struct rx65n_sbram_s *bbr;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct rx65n_sbram_s *)inode->i_private;
/* Increment the reference count */
@@ -257,7 +257,7 @@ static int rx65n_sbram_close(struct file *filep)
struct rx65n_sbram_s *bbr;
int ret = OK;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct rx65n_sbram_s *)inode->i_private;
nxmutex_lock(&bbr->lock);
@@ -299,7 +299,7 @@ static off_t rx65n_sbram_seek(struct file *filep, off_t offset,
off_t newpos;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct rx65n_sbram_s *)inode->i_private;
nxmutex_lock(&bbr->lock);
@@ -368,7 +368,7 @@ static ssize_t rx65n_sbram_read(struct file *filep, char *buffer,
struct inode *inode = filep->f_inode;
struct rx65n_sbram_s *bbr;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct rx65n_sbram_s *)inode->i_private;
nxmutex_lock(&bbr->lock);
@@ -410,7 +410,7 @@ static ssize_t rx65n_sbram_write(struct file *filep, const char *buffer,
struct rx65n_sbram_s *bbr;
int ret = -EFBIG;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct rx65n_sbram_s *)inode->i_private;
/* Forbid writes past the end of the device */
@@ -466,7 +466,7 @@ static int rx65n_sbram_ioctl(struct file *filep, int cmd, unsigned long arg)
struct rx65n_sbram_s *bbr;
int ret = -ENOTTY;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct rx65n_sbram_s *)inode->i_private;
if (cmd == RX65N_SBRAM_GETDESC_IOCTL)
@@ -513,7 +513,7 @@ static int rx65n_sbram_unlink(struct inode *inode)
{
struct rx65n_sbram_s *bbr;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bbr = (struct rx65n_sbram_s *)inode->i_private;
nxmutex_lock(&bbr->lock);
-1
View File
@@ -576,7 +576,6 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
struct up_dev_s *priv;
int ret = OK;
DEBUGASSERT(filep, filep->f_inode);
inode = filep->f_inode;
dev = inode->i_private;
-1
View File
@@ -572,7 +572,6 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
struct up_dev_s *priv;
int ret = OK;
DEBUGASSERT(filep, filep->f_inode);
inode = filep->f_inode;
dev = inode->i_private;
-1
View File
@@ -638,7 +638,6 @@ static int up_ioctl(struct file *filep, int cmd, unsigned long arg)
struct up_dev_s *priv;
int ret = OK;
DEBUGASSERT(filep, filep->f_inode);
inode = filep->f_inode;
dev = inode->i_private;
@@ -126,7 +126,7 @@ static int smbus_sbd_open(struct file *filep)
/* Retrieve the smbus_sbd_dev_s struct */
DEBUGASSERT(filep && filep->f_inode && filep->f_inode->i_private);
DEBUGASSERT(filep->f_inode->i_private);
dev = (struct smbus_sbd_dev_s *)filep->f_inode->i_private;
/* Increase the open reference count */
@@ -158,7 +158,7 @@ static int smbus_sbd_close(struct file *filep)
/* Retrieve the smbus_sbd_dev_s struct */
DEBUGASSERT(filep && filep->f_inode && filep->f_inode->i_private);
DEBUGASSERT(filep->f_inode->i_private);
dev = (struct smbus_sbd_dev_s *)filep->f_inode->i_private;
/* Decrease the open reference count */
@@ -222,7 +222,7 @@ static ssize_t smbus_sbd_read(struct file *filep, char *buffer,
* Battery Data slave driver.
*/
DEBUGASSERT(filep && filep->f_inode && filep->f_inode->i_private);
DEBUGASSERT(filep->f_inode->i_private);
dev = (struct smbus_sbd_dev_s *)filep->f_inode->i_private;
DEBUGASSERT(buffer);
@@ -320,7 +320,7 @@ static ssize_t smbus_sbd_write(struct file *filep, const char *buffer,
* Battery Data slave driver.
*/
DEBUGASSERT(filep && filep->f_inode && filep->f_inode->i_private);
DEBUGASSERT(filep->f_inode->i_private);
dev = (struct smbus_sbd_dev_s *)filep->f_inode->i_private;
DEBUGASSERT(buffer);
@@ -1095,10 +1095,9 @@ static int tc_open(struct file *filep)
uint8_t tmp;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct tc_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -1147,10 +1146,9 @@ static int tc_close(struct file *filep)
struct tc_dev_s *priv;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct tc_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -1188,10 +1186,9 @@ static ssize_t tc_read(struct file *filep, char *buffer, size_t len)
struct tc_sample_s sample;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct tc_dev_s *)inode->i_private;
/* Verify that the caller has provided a buffer large enough to receive
@@ -1312,10 +1309,9 @@ static int tc_ioctl(struct file *filep, int cmd, unsigned long arg)
int ret;
iinfo("cmd: %d arg: %ld\n", cmd, arg);
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct tc_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -1354,10 +1350,10 @@ static int tc_poll(struct file *filep, struct pollfd *fds, bool setup)
int i;
iinfo("setup: %d\n", (int)setup);
DEBUGASSERT(filep && fds);
DEBUGASSERT(fds);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct tc_dev_s *)inode->i_private;
/* Are we setting up the poll? Or tearing it down? */
@@ -972,10 +972,9 @@ static int tc_open(struct file *filep)
uint8_t tmp;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct tc_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -1024,10 +1023,9 @@ static int tc_close(struct file *filep)
struct tc_dev_s *priv;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct tc_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -1065,10 +1063,9 @@ static ssize_t tc_read(struct file *filep, char *buffer, size_t len)
struct tc_sample_s sample;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct tc_dev_s *)inode->i_private;
/* Verify that the caller has provided a buffer large enough to receive
@@ -1189,10 +1186,9 @@ static int tc_ioctl(struct file *filep, int cmd, unsigned long arg)
int ret;
iinfo("cmd: %d arg: %ld\n", cmd, arg);
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct tc_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -1231,10 +1227,10 @@ static int tc_poll(struct file *filep, struct pollfd *fds, bool setup)
int i;
iinfo("setup: %d\n", (int)setup);
DEBUGASSERT(filep && fds);
DEBUGASSERT(fds);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (struct tc_dev_s *)inode->i_private;
/* Are we setting up the poll? Or tearing it down? */
+7 -7
View File
@@ -118,7 +118,7 @@ static int bch_open(FAR struct file *filep)
FAR struct bchlib_s *bch;
int ret = OK;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bch = (FAR struct bchlib_s *)inode->i_private;
/* Increment the reference count */
@@ -155,7 +155,7 @@ static int bch_close(FAR struct file *filep)
FAR struct bchlib_s *bch;
int ret = OK;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bch = (FAR struct bchlib_s *)inode->i_private;
/* Get exclusive access */
@@ -223,7 +223,7 @@ static off_t bch_seek(FAR struct file *filep, off_t offset, int whence)
off_t newpos;
off_t ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bch = (FAR struct bchlib_s *)inode->i_private;
ret = nxmutex_lock(&bch->lock);
@@ -294,7 +294,7 @@ static ssize_t bch_read(FAR struct file *filep, FAR char *buffer, size_t len)
FAR struct bchlib_s *bch;
ssize_t ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bch = (FAR struct bchlib_s *)inode->i_private;
ret = nxmutex_lock(&bch->lock);
@@ -324,7 +324,7 @@ static ssize_t bch_write(FAR struct file *filep, FAR const char *buffer,
FAR struct bchlib_s *bch;
ssize_t ret = -EACCES;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bch = (FAR struct bchlib_s *)inode->i_private;
if (!bch->readonly)
@@ -361,7 +361,7 @@ static int bch_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
FAR struct bchlib_s *bch;
int ret = -ENOTTY;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bch = (FAR struct bchlib_s *)inode->i_private;
/* Process the call according to the command */
@@ -473,7 +473,7 @@ static int bch_unlink(FAR struct inode *inode)
FAR struct bchlib_s *bch;
int ret = OK;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
bch = (FAR struct bchlib_s *)inode->i_private;
/* Get exclusive access to the BCH device */
+5 -10
View File
@@ -1414,10 +1414,9 @@ static int mfrc522_open(FAR struct file *filep)
FAR struct inode *inode;
FAR struct mfrc522_dev_s *dev;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = inode->i_private;
mfrc522_configspi(dev->spi);
@@ -1443,10 +1442,9 @@ static int mfrc522_close(FAR struct file *filep)
FAR struct inode *inode;
FAR struct mfrc522_dev_s *dev;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = inode->i_private;
dev->state = MFRC522_STATE_NOT_INIT;
@@ -1472,10 +1470,9 @@ static ssize_t mfrc522_read(FAR struct file *filep, FAR char *buffer,
FAR struct mfrc522_dev_s *dev;
FAR struct picc_uid_s uid;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = inode->i_private;
/* Is a card near? */
@@ -1516,10 +1513,9 @@ static ssize_t mfrc522_write(FAR struct file *filep, FAR const char *buffer,
FAR struct inode *inode;
FAR struct mfrc522_dev_s *dev;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = inode->i_private;
UNUSED(dev);
@@ -1537,10 +1533,9 @@ static int mfrc522_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
FAR struct mfrc522_dev_s *dev;
int ret = OK;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = inode->i_private;
switch (cmd)
+5 -10
View File
@@ -850,10 +850,9 @@ static int _open(FAR struct file *filep)
FAR struct inode *inode;
FAR struct pn532_dev_s *dev;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = inode->i_private;
pn532_configspi(dev->spi);
@@ -881,10 +880,9 @@ static int _close(FAR struct file *filep)
FAR struct inode *inode;
FAR struct pn532_dev_s *dev;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = inode->i_private;
dev->config->reset(0);
@@ -918,10 +916,9 @@ static ssize_t _read(FAR struct file *filep, FAR char *buffer, size_t buflen)
FAR struct inode *inode;
FAR struct pn532_dev_s *dev;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = inode->i_private;
uint32_t id = pn532_read_passive_target_id(dev, PN532_MIFARE_ISO14443A);
@@ -946,10 +943,9 @@ static ssize_t _write(FAR struct file *filep, FAR const char *buffer,
FAR struct inode *inode;
FAR struct pn532_dev_s *dev;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = inode->i_private;
UNUSED(dev);
@@ -967,10 +963,9 @@ static int _ioctl(FAR struct file *filep, int cmd, unsigned long arg)
FAR struct pn532_dev_s *dev;
int ret = OK;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
dev = inode->i_private;
switch (cmd)
+7 -7
View File
@@ -345,7 +345,7 @@ static int ee24xx_open(FAR struct file *filep)
FAR struct ee24xx_dev_s *eedev;
int ret = OK;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
eedev = (FAR struct ee24xx_dev_s *)inode->i_private;
ret = nxmutex_lock(&eedev->lock);
@@ -382,7 +382,7 @@ static int ee24xx_close(FAR struct file *filep)
FAR struct ee24xx_dev_s *eedev;
int ret = OK;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
eedev = (FAR struct ee24xx_dev_s *)inode->i_private;
ret = nxmutex_lock(&eedev->lock);
@@ -422,7 +422,7 @@ static off_t ee24xx_seek(FAR struct file *filep, off_t offset, int whence)
int ret;
FAR struct inode *inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
eedev = (FAR struct ee24xx_dev_s *)inode->i_private;
ret = nxmutex_lock(&eedev->lock);
@@ -498,7 +498,7 @@ static ssize_t ee24xx_read(FAR struct file *filep, FAR char *buffer,
uint32_t addr_hi;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
eedev = (FAR struct ee24xx_dev_s *)inode->i_private;
ret = nxmutex_lock(&eedev->lock);
@@ -577,7 +577,7 @@ static ssize_t at24cs_read_uuid(FAR struct file *filep, FAR char *buffer,
uint8_t regindx;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
eedev = (FAR struct ee24xx_dev_s *)inode->i_private;
ret = nxmutex_lock(&eedev->lock);
@@ -653,7 +653,7 @@ static ssize_t ee24xx_write(FAR struct file *filep, FAR const char *buffer,
int ret = -EACCES;
int savelen;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
eedev = (FAR struct ee24xx_dev_s *)inode->i_private;
if (eedev->readonly)
@@ -779,7 +779,7 @@ static int ee24xx_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
FAR struct inode *inode = filep->f_inode;
int ret = 0;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
eedev = (FAR struct ee24xx_dev_s *)inode->i_private;
UNUSED(eedev);
+6 -6
View File
@@ -467,7 +467,7 @@ static int ee25xx_open(FAR struct file *filep)
FAR struct ee25xx_dev_s *eedev;
int ret = OK;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
eedev = (FAR struct ee25xx_dev_s *)inode->i_private;
ret = nxmutex_lock(&eedev->lock);
@@ -504,7 +504,7 @@ static int ee25xx_close(FAR struct file *filep)
FAR struct ee25xx_dev_s *eedev;
int ret = OK;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
eedev = (FAR struct ee25xx_dev_s *)inode->i_private;
ret = nxmutex_lock(&eedev->lock);
@@ -544,7 +544,7 @@ static off_t ee25xx_seek(FAR struct file *filep, off_t offset, int whence)
int ret;
FAR struct inode *inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
eedev = (FAR struct ee25xx_dev_s *)inode->i_private;
ret = nxmutex_lock(&eedev->lock);
@@ -616,7 +616,7 @@ static ssize_t ee25xx_read(FAR struct file *filep, FAR char *buffer,
FAR struct inode *inode = filep->f_inode;
int ret;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
eedev = (FAR struct ee25xx_dev_s *)inode->i_private;
ret = nxmutex_lock(&eedev->lock);
@@ -668,7 +668,7 @@ static ssize_t ee25xx_write(FAR struct file *filep, FAR const char *buffer,
FAR struct inode *inode = filep->f_inode;
int ret = -EACCES;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
eedev = (FAR struct ee25xx_dev_s *)inode->i_private;
if (eedev->readonly)
@@ -765,7 +765,7 @@ static int ee25xx_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
FAR struct inode *inode = filep->f_inode;
int ret = 0;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
eedev = (FAR struct ee25xx_dev_s *)inode->i_private;
UNUSED(eedev);
+1 -4
View File
@@ -124,7 +124,6 @@ static int i2cdrvr_open(FAR struct file *filep)
/* Get our private data structure */
DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
inode = filep->f_inode;
priv = (FAR struct i2c_driver_s *)inode->i_private;
@@ -161,7 +160,6 @@ static int i2cdrvr_close(FAR struct file *filep)
/* Get our private data structure */
DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
inode = filep->f_inode;
priv = (FAR struct i2c_driver_s *)inode->i_private;
@@ -231,7 +229,6 @@ static int i2cdrvr_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
/* Get our private data structure */
DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
inode = filep->f_inode;
priv = (FAR struct i2c_driver_s *)inode->i_private;
@@ -308,7 +305,7 @@ static int i2cdrvr_unlink(FAR struct inode *inode)
/* Get our private data structure */
DEBUGASSERT(inode != NULL && inode->i_private != NULL);
DEBUGASSERT(inode->i_private != NULL);
priv = (FAR struct i2c_driver_s *)inode->i_private;
/* Get exclusive access to the I2C driver state structure */
+2 -7
View File
@@ -217,10 +217,9 @@ static ssize_t i2schar_read(FAR struct file *filep, FAR char *buffer,
/* Get our private data structure */
DEBUGASSERT(filep != NULL && buffer != NULL);
DEBUGASSERT(buffer != NULL);
inode = filep->f_inode;
DEBUGASSERT(inode != NULL);
priv = (FAR struct i2schar_dev_s *)inode->i_private;
DEBUGASSERT(priv != NULL);
@@ -290,10 +289,9 @@ static ssize_t i2schar_write(FAR struct file *filep, FAR const char *buffer,
/* Get our private data structure */
DEBUGASSERT(filep && buffer);
DEBUGASSERT(buffer);
inode = filep->f_inode;
DEBUGASSERT(inode);
priv = (FAR struct i2schar_dev_s *)inode->i_private;
DEBUGASSERT(priv);
@@ -358,10 +356,7 @@ static int i2schar_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
/* Get our private data structure */
DEBUGASSERT(filep != NULL);
inode = filep->f_inode;
DEBUGASSERT(inode != NULL);
priv = (FAR struct i2schar_dev_s *)inode->i_private;
DEBUGASSERT(priv != NULL && priv->i2s && priv->i2s->ops);
+6 -10
View File
@@ -713,10 +713,9 @@ static int ads7843e_open(FAR struct file *filep)
iinfo("Opening\n");
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct ads7843e_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -767,10 +766,9 @@ static int ads7843e_close(FAR struct file *filep)
int ret;
iinfo("Closing\n");
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct ads7843e_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -811,10 +809,9 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer,
int ret;
iinfo("buffer:%p len:%d\n", buffer, len);
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct ads7843e_dev_s *)inode->i_private;
/* Verify that the caller has provided a buffer large enough to receive
@@ -938,10 +935,9 @@ static int ads7843e_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
int ret;
iinfo("cmd: %d arg: %ld\n", cmd, arg);
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct ads7843e_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -994,10 +990,10 @@ static int ads7843e_poll(FAR struct file *filep, FAR struct pollfd *fds,
int i;
iinfo("setup: %d\n", (int)setup);
DEBUGASSERT(filep && fds);
DEBUGASSERT(fds);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct ads7843e_dev_s *)inode->i_private;
/* Are we setting up the poll? Or tearing it down? */
+3 -5
View File
@@ -297,7 +297,6 @@ static int ajoy_open(FAR struct file *filep)
ajoy_buttonset_t supported;
irqstate_t flags;
DEBUGASSERT(filep && filep->f_inode);
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
priv = (FAR struct ajoy_upperhalf_s *)inode->i_private;
@@ -352,7 +351,7 @@ static int ajoy_close(FAR struct file *filep)
FAR struct ajoy_open_s *prev;
irqstate_t flags;
DEBUGASSERT(filep && filep->f_priv && filep->f_inode);
DEBUGASSERT(filep->f_priv);
opriv = filep->f_priv;
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
@@ -415,7 +414,6 @@ static ssize_t ajoy_read(FAR struct file *filep, FAR char *buffer,
irqstate_t flags;
int ret;
DEBUGASSERT(filep && filep->f_inode);
opriv = filep->f_priv;
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
@@ -465,7 +463,7 @@ static int ajoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
irqstate_t flags;
int ret;
DEBUGASSERT(filep && filep->f_priv && filep->f_inode);
DEBUGASSERT(filep->f_priv);
opriv = filep->f_priv;
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
@@ -590,7 +588,7 @@ static int ajoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
int ret = OK;
int i;
DEBUGASSERT(filep && filep->f_priv && filep->f_inode);
DEBUGASSERT(filep->f_priv);
opriv = filep->f_priv;
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
+3 -6
View File
@@ -309,7 +309,6 @@ static int btn_open(FAR struct file *filep)
btn_buttonset_t supported;
irqstate_t flags;
DEBUGASSERT(filep && filep->f_inode);
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
priv = (FAR struct btn_upperhalf_s *)inode->i_private;
@@ -364,7 +363,7 @@ static int btn_close(FAR struct file *filep)
FAR struct btn_open_s *prev;
irqstate_t flags;
DEBUGASSERT(filep && filep->f_priv && filep->f_inode);
DEBUGASSERT(filep->f_priv);
opriv = filep->f_priv;
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
@@ -432,7 +431,6 @@ static ssize_t btn_read(FAR struct file *filep, FAR char *buffer,
FAR const struct btn_lowerhalf_s *lower;
irqstate_t flags;
DEBUGASSERT(filep && filep->f_inode);
opriv = filep->f_priv;
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
@@ -478,7 +476,6 @@ static ssize_t btn_write(FAR struct file *filep, FAR const char *buffer,
irqstate_t flags;
int ret;
DEBUGASSERT(filep && filep->f_inode);
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
priv = (FAR struct btn_upperhalf_s *)inode->i_private;
@@ -529,7 +526,7 @@ static int btn_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
irqstate_t flags;
int ret = OK;
DEBUGASSERT(filep && filep->f_priv && filep->f_inode);
DEBUGASSERT(filep->f_priv);
opriv = filep->f_priv;
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
@@ -656,7 +653,7 @@ static int btn_poll(FAR struct file *filep, FAR struct pollfd *fds,
int ret = OK;
int i;
DEBUGASSERT(filep && filep->f_priv && filep->f_inode);
DEBUGASSERT(filep->f_priv);
opriv = filep->f_priv;
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
+6 -10
View File
@@ -736,10 +736,9 @@ static ssize_t mbr3108_read(FAR struct file *filep, FAR char *buffer,
irqstate_t flags;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = inode->i_private;
ret = nxmutex_lock(&priv->devlock);
@@ -783,10 +782,9 @@ static ssize_t mbr3108_write(FAR struct file *filep, FAR const char *buffer,
enum mbr3108_cmd_e type;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = inode->i_private;
if (buflen < sizeof(enum mbr3108_cmd_e))
@@ -864,10 +862,9 @@ static int mbr3108_open(FAR struct file *filep)
unsigned int use_count;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = inode->i_private;
ret = nxmutex_lock(&priv->devlock);
@@ -938,10 +935,9 @@ static int mbr3108_close(FAR struct file *filep)
int use_count;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = inode->i_private;
ret = nxmutex_lock(&priv->devlock);
@@ -988,10 +984,10 @@ static int mbr3108_poll(FAR struct file *filep, FAR struct pollfd *fds,
int ret = 0;
int i;
DEBUGASSERT(filep && fds);
DEBUGASSERT(fds);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct mbr3108_dev_s *)inode->i_private;
ret = nxmutex_lock(&priv->devlock);
+3 -5
View File
@@ -297,7 +297,6 @@ static int djoy_open(FAR struct file *filep)
djoy_buttonset_t supported;
irqstate_t flags;
DEBUGASSERT(filep && filep->f_inode);
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
priv = (FAR struct djoy_upperhalf_s *)inode->i_private;
@@ -352,7 +351,7 @@ static int djoy_close(FAR struct file *filep)
FAR struct djoy_open_s *prev;
irqstate_t flags;
DEBUGASSERT(filep && filep->f_priv && filep->f_inode);
DEBUGASSERT(filep->f_priv);
opriv = filep->f_priv;
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
@@ -415,7 +414,6 @@ static ssize_t djoy_read(FAR struct file *filep, FAR char *buffer,
irqstate_t flags;
int ret;
DEBUGASSERT(filep && filep->f_inode);
opriv = filep->f_priv;
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
@@ -461,7 +459,7 @@ static int djoy_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
irqstate_t flags;
int ret;
DEBUGASSERT(filep && filep->f_priv && filep->f_inode);
DEBUGASSERT(filep->f_priv);
opriv = filep->f_priv;
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
@@ -586,7 +584,7 @@ static int djoy_poll(FAR struct file *filep, FAR struct pollfd *fds,
int ret = OK;
int i;
DEBUGASSERT(filep && filep->f_priv && filep->f_inode);
DEBUGASSERT(filep->f_priv);
opriv = filep->f_priv;
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
+6 -10
View File
@@ -732,10 +732,9 @@ static int ft5x06_open(FAR struct file *filep)
uint8_t tmp;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct ft5x06_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -791,10 +790,9 @@ static int ft5x06_close(FAR struct file *filep)
FAR struct ft5x06_dev_s *priv;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct ft5x06_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -839,10 +837,9 @@ static ssize_t ft5x06_read(FAR struct file *filep, FAR char *buffer,
FAR struct ft5x06_dev_s *priv;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct ft5x06_dev_s *)inode->i_private;
/* Verify that the caller has provided a buffer large enough to receive
@@ -912,10 +909,9 @@ static int ft5x06_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
int ret;
iinfo("cmd: %d arg: %ld\n", cmd, arg);
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct ft5x06_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -969,10 +965,10 @@ static int ft5x06_poll(FAR struct file *filep, FAR struct pollfd *fds,
int i;
iinfo("setup: %d\n", (int)setup);
DEBUGASSERT(filep && fds);
DEBUGASSERT(fds);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct ft5x06_dev_s *)inode->i_private;
/* Are we setting up the poll? Or tearing it down? */
+5 -8
View File
@@ -488,9 +488,8 @@ static ssize_t gt9xx_read(FAR struct file *filep, FAR char *buffer,
/* Get the Touch Panel Device */
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = inode->i_private;
/* Begin Mutex: Lock to prevent concurrent reads */
@@ -606,9 +605,8 @@ static int gt9xx_open(FAR struct file *filep)
/* Get the Touch Panel Device */
iinfo("\n");
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = inode->i_private;
/* Begin Mutex: Lock to prevent concurrent update to Reference Count */
@@ -692,9 +690,8 @@ static int gt9xx_close(FAR struct file *filep)
/* Get the Touch Panel Device */
iinfo("\n");
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = inode->i_private;
/* Begin Mutex: Lock to prevent concurrent update to Reference Count */
@@ -762,9 +759,9 @@ static int gt9xx_poll(FAR struct file *filep, FAR struct pollfd *fds,
/* Get the Touch Panel Device */
iinfo("setup=%d\n", setup);
DEBUGASSERT(filep && fds);
DEBUGASSERT(fds);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct gt9xx_dev_s *)inode->i_private;
/* Begin Mutex: Lock to prevent concurrent update to Poll Waiters */
+6 -10
View File
@@ -706,10 +706,9 @@ static int max11802_open(FAR struct file *filep)
iinfo("Opening\n");
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct max11802_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -760,10 +759,9 @@ static int max11802_close(FAR struct file *filep)
int ret;
iinfo("Closing\n");
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct max11802_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -804,10 +802,9 @@ static ssize_t max11802_read(FAR struct file *filep, FAR char *buffer,
int ret;
iinfo("buffer:%p len:%d\n", buffer, len);
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct max11802_dev_s *)inode->i_private;
/* Verify that the caller has provided a buffer large enough to receive
@@ -931,10 +928,9 @@ static int max11802_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
int ret;
iinfo("cmd: %d arg: %ld\n", cmd, arg);
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct max11802_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -987,10 +983,10 @@ static int max11802_poll(FAR struct file *filep, FAR struct pollfd *fds,
int i;
iinfo("setup: %d\n", (int)setup);
DEBUGASSERT(filep && fds);
DEBUGASSERT(fds);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct max11802_dev_s *)inode->i_private;
/* Are we setting up the poll? Or tearing it down? */
+6 -10
View File
@@ -1104,10 +1104,9 @@ static int mxt_open(FAR struct file *filep)
uint8_t tmp;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct mxt_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -1182,10 +1181,9 @@ static int mxt_close(FAR struct file *filep)
FAR struct mxt_dev_s *priv;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct mxt_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -1237,10 +1235,9 @@ static ssize_t mxt_read(FAR struct file *filep, FAR char *buffer, size_t len)
int i;
int j;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct mxt_dev_s *)inode->i_private;
/* Verify that the caller has provided a buffer large enough to receive
@@ -1464,10 +1461,9 @@ static int mxt_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
int ret;
iinfo("cmd: %d arg: %ld\n", cmd, arg);
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct mxt_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -1521,10 +1517,10 @@ static int mxt_poll(FAR struct file *filep, FAR struct pollfd *fds,
int i;
iinfo("setup: %d\n", (int)setup);
DEBUGASSERT(filep && fds);
DEBUGASSERT(fds);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct mxt_dev_s *)inode->i_private;
/* Are we setting up the poll? Or tearing it down? */
+2 -4
View File
@@ -275,7 +275,6 @@ static int nunchuck_open(FAR struct file *filep)
FAR struct nunchuck_open_s *opriv;
int ret;
DEBUGASSERT(filep && filep->f_inode);
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
priv = (FAR struct nunchuck_dev_s *)inode->i_private;
@@ -330,7 +329,7 @@ static int nunchuck_close(FAR struct file *filep)
bool closing;
int ret;
DEBUGASSERT(filep && filep->f_priv && filep->f_inode);
DEBUGASSERT(filep->f_priv);
opriv = filep->f_priv;
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
@@ -414,7 +413,6 @@ static ssize_t nunchuck_read(FAR struct file *filep, FAR char *buffer,
FAR struct nunchuck_dev_s *priv;
int ret;
DEBUGASSERT(filep && filep->f_inode);
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
priv = (FAR struct nunchuck_dev_s *)inode->i_private;
@@ -462,7 +460,7 @@ static int nunchuck_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
FAR struct nunchuck_dev_s *priv;
int ret;
DEBUGASSERT(filep && filep->f_priv && filep->f_inode);
DEBUGASSERT(filep->f_priv);
inode = filep->f_inode;
DEBUGASSERT(inode->i_private);
priv = (FAR struct nunchuck_dev_s *)inode->i_private;
+2 -4
View File
@@ -453,7 +453,6 @@ static int spq10kbd_open(FAR struct file *filep)
FAR struct inode *inode;
FAR struct spq10kbd_dev_s *priv;
DEBUGASSERT(filep && filep->f_inode);
inode = filep->f_inode;
priv = inode->i_private;
@@ -477,7 +476,6 @@ static int spq10kbd_close(FAR struct file *filep)
FAR struct inode *inode;
FAR struct spq10kbd_dev_s *priv;
DEBUGASSERT(filep && filep->f_inode);
inode = filep->f_inode;
priv = inode->i_private;
@@ -507,7 +505,7 @@ static ssize_t spq10kbd_read(FAR struct file *filep, FAR char *buffer,
uint16_t tail;
int ret;
DEBUGASSERT(filep && filep->f_inode && buffer);
DEBUGASSERT(buffer);
inode = filep->f_inode;
priv = inode->i_private;
@@ -607,7 +605,7 @@ static int spq10kbd_poll(FAR struct file *filep, FAR struct pollfd *fds,
int ret;
int i;
DEBUGASSERT(filep && filep->f_inode && fds);
DEBUGASSERT(fds);
inode = filep->f_inode;
priv = inode->i_private;
+6 -10
View File
@@ -308,10 +308,9 @@ static int stmpe811_open(FAR struct file *filep)
uint8_t tmp;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct stmpe811_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -365,10 +364,9 @@ static int stmpe811_close(FAR struct file *filep)
FAR struct stmpe811_dev_s *priv;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct stmpe811_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -413,10 +411,9 @@ static ssize_t stmpe811_read(FAR struct file *filep,
int ret;
iinfo("len=%d\n", len);
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct stmpe811_dev_s *)inode->i_private;
/* Verify that the caller has provided a buffer large enough to receive
@@ -538,10 +535,9 @@ static int stmpe811_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
int ret;
iinfo("cmd: %d arg: %ld\n", cmd, arg);
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct stmpe811_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -631,10 +627,10 @@ static int stmpe811_poll(FAR struct file *filep, FAR struct pollfd *fds,
int i;
iinfo("setup: %d\n", (int)setup);
DEBUGASSERT(filep && fds);
DEBUGASSERT(fds);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct stmpe811_dev_s *)inode->i_private;
/* Are we setting up the poll? Or tearing it down? */
+6 -10
View File
@@ -776,10 +776,9 @@ static int tsc2007_open(FAR struct file *filep)
uint8_t tmp;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct tsc2007_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -829,10 +828,9 @@ static int tsc2007_close(FAR struct file *filep)
FAR struct tsc2007_dev_s *priv;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct tsc2007_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -872,10 +870,9 @@ static ssize_t tsc2007_read(FAR struct file *filep, FAR char *buffer,
struct tsc2007_sample_s sample;
int ret;
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct tsc2007_dev_s *)inode->i_private;
/* Verify that the caller has provided a buffer large enough to receive
@@ -1003,10 +1000,9 @@ static int tsc2007_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
int ret;
iinfo("cmd: %d arg: %ld\n", cmd, arg);
DEBUGASSERT(filep);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct tsc2007_dev_s *)inode->i_private;
/* Get exclusive access to the driver data structure */
@@ -1076,10 +1072,10 @@ static int tsc2007_poll(FAR struct file *filep, FAR struct pollfd *fds,
int i;
iinfo("setup: %d\n", (int)setup);
DEBUGASSERT(filep && fds);
DEBUGASSERT(fds);
inode = filep->f_inode;
DEBUGASSERT(inode && inode->i_private);
DEBUGASSERT(inode->i_private);
priv = (FAR struct tsc2007_dev_s *)inode->i_private;
/* Are we setting up the poll? Or tearing it down? */
-3
View File
@@ -115,7 +115,6 @@ static ssize_t gpio_read(FAR struct file *filep, FAR char *buffer,
FAR struct gpio_dev_s *dev;
int ret;
DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
inode = filep->f_inode;
DEBUGASSERT(inode->i_private != NULL);
dev = inode->i_private;
@@ -174,7 +173,6 @@ static ssize_t gpio_write(FAR struct file *filep, FAR const char *buffer,
int ret;
bool val;
DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
inode = filep->f_inode;
DEBUGASSERT(inode->i_private != NULL);
dev = inode->i_private;
@@ -278,7 +276,6 @@ static int gpio_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
int i;
int j = 0;
DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
inode = filep->f_inode;
DEBUGASSERT(inode->i_private != NULL);
dev = inode->i_private;
-1
View File
@@ -63,7 +63,6 @@ int ipcc_close(FAR struct file *filep)
/* Get our private data structure */
DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
priv = filep->f_inode->i_private;
/* Get exclusive access to the IPCC driver state structure */
-1
View File
@@ -60,7 +60,6 @@ int ipcc_open(FAR struct file *filep)
/* Get our private data structure */
DEBUGASSERT(filep != NULL && filep->f_inode != NULL);
priv = filep->f_inode->i_private;
/* Get exclusive access to the IPCC driver state structure */

Some files were not shown because too many files have changed in this diff Show More