sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i2c: Optimize access to private data

Browse Source 
Signed-off-by: Shoukui Zhang <zhangshoukui@xiaomi.com>
This commit is contained in:
Shoukui Zhang 2023-10-27 19:22:16 +08:00 committed by Mateusz Szafoni
parent 2c543c27bf
commit 985e539e02
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/i2c/i2c_driver.c
View File

@ -116,16 +116,16 @@ static const struct file_operations g_i2cdrvr_fops =
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
static int i2cdrvr_open(FAR struct file *filep) static int i2cdrvr_open(FAR struct file *filep)
{ {
FAR struct inode *inode;
FAR struct i2c_driver_s *priv; FAR struct i2c_driver_s *priv;
int ret; int ret;
/* Sanity check */
DEBUGASSERT(filep->f_inode->i_private != NULL);
/* Get our private data structure */ /* Get our private data structure */
inode = filep->f_inode; priv = filep->f_inode->i_private;
priv = inode->i_private;
DEBUGASSERT(priv);
/* Get exclusive access to the I2C driver state structure */ /* Get exclusive access to the I2C driver state structure */
@ -164,16 +164,16 @@ out:
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
static int i2cdrvr_close(FAR struct file *filep) static int i2cdrvr_close(FAR struct file *filep)
{ {
FAR struct inode *inode;
FAR struct i2c_driver_s *priv; FAR struct i2c_driver_s *priv;
int ret; int ret;
/* Sanity check */
DEBUGASSERT(filep->f_inode->i_private != NULL);
/* Get our private data structure */ /* Get our private data structure */
inode = filep->f_inode; priv = filep->f_inode->i_private;
priv = inode->i_private;
DEBUGASSERT(priv);
/* Get exclusive access to the I2C driver state structure */ /* Get exclusive access to the I2C driver state structure */
@ -207,6 +207,7 @@ static int i2cdrvr_close(FAR struct file *filep)
{ {
nxmutex_destroy(&priv->lock); nxmutex_destroy(&priv->lock);
kmm_free(priv); kmm_free(priv);
filep->f_inode->i_private = NULL;
return OK; return OK;
} }
@ -242,19 +243,18 @@ static ssize_t i2cdrvr_write(FAR struct file *filep, FAR const char *buffer,
static int i2cdrvr_ioctl(FAR struct file *filep, int cmd, unsigned long arg) static int i2cdrvr_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
{ {
FAR struct inode *inode;
FAR struct i2c_driver_s *priv; FAR struct i2c_driver_s *priv;
FAR struct i2c_transfer_s *transfer; FAR struct i2c_transfer_s *transfer;
int ret; int ret;
/* Sanity check */
DEBUGASSERT(filep->f_inode->i_private != NULL);
i2cinfo("cmd=%x arg=%08lx\n", cmd, arg); i2cinfo("cmd=%x arg=%08lx\n", cmd, arg);
/* Get our private data structure */ /* Get our private data structure */
inode = filep->f_inode; priv = filep->f_inode->i_private;
priv = inode->i_private;
DEBUGASSERT(priv);
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS #ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
/* Get exclusive access to the I2C driver state structure */ /* Get exclusive access to the I2C driver state structure */
@ -325,9 +325,12 @@ static int i2cdrvr_unlink(FAR struct inode *inode)
FAR struct i2c_driver_s *priv; FAR struct i2c_driver_s *priv;
int ret; int ret;
/* Get our private data structure */ /* Sanity check */
DEBUGASSERT(inode->i_private != NULL); DEBUGASSERT(inode->i_private != NULL);
/* Get our private data structure */
priv = inode->i_private; priv = inode->i_private;
/* Get exclusive access to the I2C driver state structure */ /* Get exclusive access to the I2C driver state structure */
@ -344,6 +347,7 @@ static int i2cdrvr_unlink(FAR struct inode *inode)
{ {
nxmutex_destroy(&priv->lock); nxmutex_destroy(&priv->lock);
kmm_free(priv); kmm_free(priv);
inode->i_private = NULL;
return OK; return OK;
} }