Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-27 03:05:40 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Replace nxsem API when used as a lock with nxmutex API

Browse Source 
Signed-off-by: anjiahao <anjiahao@xiaomi.com>
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
anjiahao
2022-09-06 14:18:45 +08:00
committed by Masayuki Ishikawa
parent 0dfd1f004d
commit d1d46335df
710 changed files with 7503 additions and 14852 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/power/supply/powerled.c
+8 -8
View File
@@ -88,7 +88,7 @@ static int powerled_open(FAR struct file *filep)
/* If the port is the middle of closing, wait until the close is finished */
ret = nxsem_wait(&dev->closesem);
ret = nxmutex_lock(&dev->closelock);
if (ret >= 0)
{
/* Increment the count of references to the device. If this the first
@@ -126,7 +126,7 @@ static int powerled_open(FAR struct file *filep)
}
}
nxsem_post(&dev->closesem);
nxmutex_unlock(&dev->closelock);
}
return OK;
@@ -148,7 +148,7 @@ static int powerled_close(FAR struct file *filep)
irqstate_t flags;
int ret;
ret = nxsem_wait(&dev->closesem);
ret = nxmutex_lock(&dev->closelock);
if (ret >= 0)
{
/* Decrement the references to the driver. If the reference count will
@@ -158,7 +158,7 @@ static int powerled_close(FAR struct file *filep)
if (dev->ocount > 1)
{
dev->ocount--;
nxsem_post(&dev->closesem);
nxmutex_unlock(&dev->closelock);
}
else
{
@@ -172,7 +172,7 @@ static int powerled_close(FAR struct file *filep)
dev->ops->shutdown(dev); /* Disable the POWERLED */
leave_critical_section(flags);
nxsem_post(&dev->closesem);
nxmutex_unlock(&dev->closelock);
}
}
@@ -406,9 +406,9 @@ int powerled_register(FAR const char *path, FAR struct powerled_dev_s *dev,
dev->ocount = 0;
/* Initialize semaphores */
/* Initialize mutex */
nxsem_init(&dev->closesem, 0, 1);
nxmutex_init(&dev->closelock);
/* Connect POWERLED driver with lower level interface */
@@ -419,7 +419,7 @@ int powerled_register(FAR const char *path, FAR struct powerled_dev_s *dev,
ret = register_driver(path, &powerled_fops, 0666, dev);
if (ret < 0)
{
nxsem_destroy(&dev->closesem);
nxmutex_destroy(&dev->closelock);
}
return ret;
drivers/power/supply/regulator.c
+25 -26
View File
@@ -58,7 +58,7 @@ static int _regulator_set_voltage_unlocked(FAR struct regulator_s *regulator,
****************************************************************************/
static struct list_node g_reg_list = LIST_INITIAL_VALUE(g_reg_list);
static sem_t g_reg_sem = SEM_INITIALIZER(1);
static mutex_t g_reg_lock = NXMUTEX_INITIALIZER;
/****************************************************************************
* Private Functions
@@ -150,7 +150,7 @@ static FAR struct regulator_dev_s *regulator_dev_lookup(const char *supply)
FAR struct regulator_dev_s *rdev;
FAR struct regulator_dev_s *rdev_found = NULL;
nxsem_wait_uninterruptible(&g_reg_sem);
nxmutex_lock(&g_reg_lock);
list_for_every_entry(&g_reg_list, rdev, struct regulator_dev_s, list)
{
if (rdev->desc->name && strcmp(rdev->desc->name, supply) == 0)
@@ -160,7 +160,7 @@ static FAR struct regulator_dev_s *regulator_dev_lookup(const char *supply)
}
}
nxsem_post(&g_reg_sem);
nxmutex_unlock(&g_reg_lock);
#if defined(CONFIG_REGULATOR_RPMSG)
if (rdev_found == NULL)
@@ -416,10 +416,10 @@ FAR struct regulator_s *regulator_get(FAR const char *id)
regulator->rdev = rdev;
list_initialize(&regulator->list);
nxsem_wait_uninterruptible(&rdev->regulator_sem);
nxmutex_lock(&rdev->regulator_lock);
rdev->open_count++;
list_add_tail(&rdev->consumer_list, &regulator->list);
nxsem_post(&rdev->regulator_sem);
nxmutex_unlock(&rdev->regulator_lock);
return regulator;
}
@@ -448,14 +448,14 @@ void regulator_put(FAR struct regulator_s *regulator)
rdev = regulator->rdev;
nxsem_wait_uninterruptible(&g_reg_sem);
nxmutex_lock(&g_reg_lock);
nxsem_wait_uninterruptible(&rdev->regulator_sem);
nxmutex_lock(&rdev->regulator_lock);
list_delete(&regulator->list);
rdev->open_count--;
nxsem_post(&rdev->regulator_sem);
nxmutex_unlock(&rdev->regulator_lock);
nxsem_post(&g_reg_sem);
nxmutex_unlock(&g_reg_lock);
kmm_free(regulator);
}
@@ -487,9 +487,9 @@ int regulator_is_enabled(FAR struct regulator_s *regulator)
rdev = regulator->rdev;
nxsem_wait_uninterruptible(&rdev->regulator_sem);
nxmutex_lock(&rdev->regulator_lock);
ret = _regulator_is_enabled(rdev);
nxsem_post(&rdev->regulator_sem);
nxmutex_unlock(&rdev->regulator_lock);
return ret;
}
@@ -521,7 +521,7 @@ int regulator_enable(FAR struct regulator_s *regulator)
rdev = regulator->rdev;
nxsem_wait_uninterruptible(&rdev->regulator_sem);
nxmutex_lock(&rdev->regulator_lock);
if (rdev->use_count == 0)
{
ret = _regulator_do_enable(rdev);
@@ -534,8 +534,7 @@ int regulator_enable(FAR struct regulator_s *regulator)
rdev->use_count++;
err:
nxsem_post(&rdev->regulator_sem);
nxmutex_unlock(&rdev->regulator_lock);
return ret;
}
@@ -594,7 +593,7 @@ int regulator_disable(FAR struct regulator_s *regulator)
rdev = regulator->rdev;
nxsem_wait_uninterruptible(&rdev->regulator_sem);
nxmutex_lock(&rdev->regulator_lock);
if (rdev->use_count <= 0)
{
ret = -EIO;
@@ -613,7 +612,7 @@ int regulator_disable(FAR struct regulator_s *regulator)
rdev->use_count--;
err:
nxsem_post(&rdev->regulator_sem);
nxmutex_unlock(&rdev->regulator_lock);
return ret;
}
@@ -673,9 +672,9 @@ int regulator_set_voltage(FAR struct regulator_s *regulator,
rdev = regulator->rdev;
nxsem_wait_uninterruptible(&rdev->regulator_sem);
nxmutex_lock(&rdev->regulator_lock);
ret = _regulator_set_voltage_unlocked(regulator, min_uv, max_uv);
nxsem_post(&rdev->regulator_sem);
nxmutex_unlock(&rdev->regulator_lock);
return ret;
}
@@ -707,9 +706,9 @@ int regulator_get_voltage(FAR struct regulator_s *regulator)
rdev = regulator->rdev;
nxsem_wait_uninterruptible(&rdev->regulator_sem);
nxmutex_lock(&rdev->regulator_lock);
ret = _regulator_get_voltage(rdev);
nxsem_post(&rdev->regulator_sem);
nxmutex_unlock(&rdev->regulator_lock);
return ret;
}
@@ -776,7 +775,7 @@ regulator_register(FAR const struct regulator_desc_s *regulator_desc,
rdev->desc = regulator_desc;
rdev->ops = regulator_ops;
rdev->priv = priv;
nxsem_init(&rdev->regulator_sem, 0, 1);
nxmutex_init(&rdev->regulator_lock);
list_initialize(&rdev->consumer_list);
list_initialize(&rdev->list);
@@ -795,9 +794,9 @@ regulator_register(FAR const struct regulator_desc_s *regulator_desc,
rdev->desc->apply_uv);
}
nxsem_wait_uninterruptible(&g_reg_sem);
nxmutex_lock(&g_reg_lock);
list_add_tail(&g_reg_list, &rdev->list);
nxsem_post(&g_reg_sem);
nxmutex_unlock(&g_reg_lock);
return rdev;
}
@@ -818,16 +817,16 @@ void regulator_unregister(FAR struct regulator_dev_s *rdev)
return;
}
nxsem_wait_uninterruptible(&g_reg_sem);
nxmutex_lock(&g_reg_lock);
if (rdev->open_count)
{
pwrerr("unregister, open %" PRIu32 "\n", rdev->open_count);
nxsem_post(&g_reg_sem);
nxmutex_unlock(&g_reg_lock);
return;
}
list_delete(&rdev->list);
nxsem_post(&g_reg_sem);
nxmutex_unlock(&g_reg_lock);
kmm_free(rdev);
}
drivers/power/supply/smps.c
+8 -8
View File
@@ -92,7 +92,7 @@ static int smps_open(FAR struct file *filep)
/* If the port is the middle of closing, wait until the close is finished */
ret = nxsem_wait(&dev->closesem);
ret = nxmutex_lock(&dev->closelock);
if (ret >= 0)
{
/* Increment the count of references to the device. If this the first
@@ -130,7 +130,7 @@ static int smps_open(FAR struct file *filep)
}
}
nxsem_post(&dev->closesem);
nxmutex_unlock(&dev->closelock);
}
return OK;
@@ -152,7 +152,7 @@ static int smps_close(FAR struct file *filep)
irqstate_t flags;
int ret;
ret = nxsem_wait(&dev->closesem);
ret = nxmutex_lock(&dev->closelock);
if (ret >= 0)
{
/* Decrement the references to the driver. If the reference count will
@@ -162,7 +162,7 @@ static int smps_close(FAR struct file *filep)
if (dev->ocount > 1)
{
dev->ocount--;
nxsem_post(&dev->closesem);
nxmutex_unlock(&dev->closelock);
}
else
{
@@ -176,7 +176,7 @@ static int smps_close(FAR struct file *filep)
dev->ops->shutdown(dev); /* Disable the SMPS */
leave_critical_section(flags);
nxsem_post(&dev->closesem);
nxmutex_unlock(&dev->closelock);
}
}
@@ -503,9 +503,9 @@ int smps_register(FAR const char *path, FAR struct smps_dev_s *dev,
dev->ocount = 0;
/* Initialize semaphores */
/* Initialize mutex */
nxsem_init(&dev->closesem, 0, 1);
nxmutex_init(&dev->closelock);
/* Connect SMPS driver with lower level interface */
@@ -516,7 +516,7 @@ int smps_register(FAR const char *path, FAR struct smps_dev_s *dev,
ret = register_driver(path, &smps_fops, 0666, dev);
if (ret < 0)
{
nxsem_destroy(&dev->closesem);
nxmutex_destroy(&dev->closelock);
}
return ret;