pkarashchenko commented on code in PR #6965:
URL: https://github.com/apache/incubator-nuttx/pull/6965#discussion_r996410754
##########
drivers/sensors/qencoder.c:
##########
@@ -409,7 +409,7 @@ int qe_register(FAR const char *devpath, FAR struct
qe_lowerhalf_s *lower)
* (it was already zeroed by kmm_zalloc())
*/
- nxsem_init(&upper->exclsem, 0, 1);
+ nxmutex_init(&upper->lock);
Review Comment:
ditto. additionally need to add `kmm_free` if `register_driver` fails
##########
drivers/sensors/mlx90393.c:
##########
@@ -587,7 +586,7 @@ int mlx90393_register(FAR const char *devpath, FAR struct
spi_dev_s *spi,
{
snerr("ERROR: Failed to register driver: %d\n", ret);
kmm_free(priv);
- nxsem_destroy(&priv->datasem);
+ nxmutex_destroy(&priv->datalock);
Review Comment:
```suggestion
```
##########
drivers/sensors/bmg160.c:
##########
@@ -552,7 +552,7 @@ int bmg160_register(FAR const char *devpath, FAR struct
spi_dev_s *spi,
{
snerr("ERROR: Failed to register driver: %d\n", ret);
kmm_free(priv);
- nxsem_destroy(&priv->datasem);
+ nxmutex_destroy(&priv->datalock);
Review Comment:
ditto. either move before `kmm_free(priv);` or remove
##########
drivers/sensors/aht10.c:
##########
@@ -651,7 +600,7 @@ int aht10_register(FAR const char *devpath, FAR struct
i2c_master_s *i2c,
priv->i2c = i2c;
priv->addr = addr;
- nxsem_init(&priv->devsem, 0, 1);
+ nxmutex_init(&priv->devlock);
Review Comment:
ditto
##########
drivers/sensors/bmg160.c:
##########
@@ -527,9 +527,9 @@ int bmg160_register(FAR const char *devpath, FAR struct
spi_dev_s *spi,
priv->config = config;
priv->work.worker = NULL;
- /* Initialize sensor data access semaphore */
+ /* Initialize sensor data access mutex */
- nxsem_init(&priv->datasem, 0, 1);
+ nxmutex_init(&priv->datalock);
Review Comment:
ditto. after `priv->config->attach`
##########
drivers/sensors/lis3dsh.c:
##########
@@ -555,7 +553,7 @@ int lis3dsh_register(FAR const char *devpath, FAR struct
spi_dev_s *spi,
{
snerr("ERROR: Failed to register driver: %d\n", ret);
kmm_free(priv);
- nxsem_destroy(&priv->datasem);
+ nxmutex_destroy(&priv->datalock);
Review Comment:
ditto. either move this call before `kmm_free` or remove.
Additionally add same code in case if `priv->config->attach` fails and
unregister driver
##########
drivers/sensors/lis3dh.c:
##########
@@ -1024,7 +985,7 @@ int lis3dh_register(FAR const char *devpath, FAR struct
spi_dev_s *spi,
{
snerr("ERROR: Failed to register driver: %d\n", ret);
kmm_free(priv);
- nxsem_destroy(&priv->queuesem);
+ nxmutex_destroy(&priv->queuelock);
nxsem_destroy(&priv->readsem);
Review Comment:
ditto. either move two calls before `kmm_free` or remove
##########
drivers/sensors/lsm330_spi.c:
##########
@@ -1409,7 +1405,7 @@ int lsm330_register(FAR const char *devpath_acl,
priv->flink = g_lsm330g_list;
g_lsm330g_list = priv;
- config_gyro->leaf_handle = (void *) priv;
+ config_gyro->leaf_handle = (void *)priv;
Review Comment:
style change. seems that should be removed from this PR
##########
drivers/sensors/lsm330_spi.c:
##########
@@ -1397,7 +1393,7 @@ int lsm330_register(FAR const char *devpath_acl,
{
snerr("ERROR: Failed to register gyroscope driver: %d\n", ret);
- nxsem_destroy(&priv->datasem);
+ nxmutex_destroy(&priv->devicelock);
kmm_free(priv);
Review Comment:
```suggestion
```
fix double free
##########
drivers/sensors/adxl345_base.c:
##########
@@ -373,7 +373,7 @@ ADXL345_HANDLE adxl345_instantiate(FAR struct i2c_master_s
*dev,
/* Initialize the device state structure */
- nxsem_init(&priv->exclsem, 0, 1);
+ nxmutex_init(&priv->lock);
Review Comment:
We need to refine all cases in `drivers/sensors/xxx.c` and either to call
`nxmutex_destroy` before `kmm_free` or remove call of `nxmutex_destroy` and
call `kmm_free` only. Calling of `nxmutex_destroy` seems to be correct from
logical perspective, but do not bring any value from functional perspective
##########
drivers/sensors/hall3ph.c:
##########
@@ -349,7 +349,7 @@ int hall3_register(FAR const char *devpath,
* (it was already zeroed by kmm_zalloc())
*/
- nxsem_init(&upper->exclsem, 0, 1);
+ nxmutex_init(&upper->lock);
Review Comment:
ditto.
need to free memory if `register_driver` fails additionally
##########
drivers/sensors/scd41.c:
##########
@@ -1012,7 +1013,7 @@ int scd41_register_i2c(FAR const char *devpath, FAR
struct i2c_master_s *i2c)
priv->altitude_comp = SCD41_DEFAULT_ALTITUDE_COMPENSATION;
priv->temperature_offset = SCD41_DEFAULT_TEMPERATURE_OFFSET;
- nxsem_init(&priv->devsem, 0, 1);
+ nxmutex_init(&priv->devlock);
Review Comment:
ditto
##########
drivers/sensors/hdc1008.c:
##########
@@ -961,15 +959,15 @@ int hdc1008_register(FAR const char *devpath, FAR struct
i2c_master_s *i2c,
priv->i2c = i2c;
priv->addr = addr;
- nxsem_init(&priv->devsem, 0, 1);
+ nxmutex_init(&priv->devlock);
/* Register the driver */
ret = register_driver(devpath, &g_hdc1008fops, 0666, priv);
if (ret < 0)
{
snerr("ERROR: Failed to register driver: %d\n", ret);
- nxsem_destroy(&priv->devsem);
+ nxmutex_destroy(&priv->devlock);
Review Comment:
ditto
##########
drivers/sensors/t67xx.c:
##########
@@ -721,7 +721,7 @@ int t67xx_register(FAR const char *devpath, FAR struct
i2c_master_s *i2c,
priv->i2c = i2c;
priv->addr = addr;
- nxsem_init(&priv->devsem, 0, 1);
+ nxmutex_init(&priv->devlock);
Review Comment:
ditto
##########
drivers/sensors/dhtxx.c:
##########
@@ -561,6 +561,8 @@ int dhtxx_register(FAR const char *devpath,
priv->config = config;
+ nxmutex_init(&priv->devlock);
Review Comment:
ditto
##########
drivers/sensors/adxl372.c:
##########
@@ -872,7 +869,7 @@ int adxl372_register(FAR const char *devpath,
{
snerr("ERROR: Failed to register accelerometer driver: %d\n", ret);
- nxsem_destroy(&priv->datasem);
+ nxmutex_destroy(&priv->devicelock);
Review Comment:
ditto
##########
drivers/sensors/hdc1008.c:
##########
@@ -999,7 +997,7 @@ int hdc1008_register(FAR const char *devpath, FAR struct
i2c_master_s *i2c,
if (ret < 0)
{
snerr("ERROR: failed to set default configuration: %d\n", ret);
- nxsem_destroy(&priv->devsem);
+ nxmutex_destroy(&priv->devlock);
Review Comment:
ditto
##########
drivers/sensors/hc_sr04.c:
##########
@@ -415,7 +416,7 @@ int hcsr04_register(FAR const char *devpath,
}
priv->config = config;
- nxsem_init(&priv->devsem, 0, 1);
+ nxmutex_init(&priv->devlock);
Review Comment:
ditto
##########
drivers/spi/spi_driver.c:
##########
@@ -366,7 +366,7 @@ int spi_register(FAR struct spi_dev_s *spi, int bus)
priv->spi = spi;
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
- nxsem_init(&priv->exclsem, 0, 1);
+ nxmutex_init(&priv->lock);
Review Comment:
ditto
##########
drivers/sensors/zerocross.c:
##########
@@ -501,15 +501,15 @@ int zc_register(FAR const char *devname, FAR struct
zc_lowerhalf_s *lower)
/* Initialize the new zero cross driver instance */
priv->lower = lower;
- nxsem_init(&priv->exclsem, 0, 1);
+ nxmutex_init(&priv->lock);
/* And register the zero cross driver */
ret = register_driver(devname, &g_zcops, 0666, priv);
if (ret < 0)
{
snerr("ERROR: register_driver failed: %d\n", ret);
- nxsem_destroy(&priv->exclsem);
+ nxmutex_destroy(&priv->lock);
Review Comment:
ditto
##########
drivers/serial/ptmx.c:
##########
@@ -276,7 +277,7 @@ int ptmx_register(void)
{
/* Initialize driver state */
- nxsem_init(&g_ptmx.px_exclsem, 0, 1);
+ nxmutex_init(&g_ptmx.px_lock);
Review Comment:
ditto. either keep like it is or add `nxmutex_destroy` if `register_driver`
fails
##########
drivers/sensors/hdc1008.c:
##########
@@ -987,7 +985,7 @@ int hdc1008_register(FAR const char *devpath, FAR struct
i2c_master_s *i2c,
if (ret < 0)
{
snerr("ERROR: failed to read default configuration\n");
- nxsem_destroy(&priv->devsem);
+ nxmutex_destroy(&priv->devlock);
Review Comment:
ditto
##########
drivers/timers/oneshot.c:
##########
@@ -316,15 +316,15 @@ int oneshot_register(FAR const char *devname,
/* Initialize the new oneshot timer driver instance */
priv->od_lower = lower;
- nxsem_init(&priv->od_exclsem, 0, 1);
+ nxmutex_init(&priv->od_lock);
/* And register the oneshot timer driver */
ret = register_driver(devname, &g_oneshot_ops, 0666, priv);
if (ret < 0)
{
tmrerr("ERROR: register_driver failed: %d\n", ret);
- nxsem_destroy(&priv->od_exclsem);
+ nxmutex_destroy(&priv->od_lock);
Review Comment:
ditto
##########
drivers/sensors/hyt271.c:
##########
@@ -973,7 +973,7 @@ int hyt271_register(int devno, FAR struct i2c_master_s
*i2c, uint8_t addr,
temp_err:
sensor_unregister(&priv->sensor[HYT271_SENSOR_TEMP].lower, devno);
- nxsem_destroy(&priv->lock_measure_cycle);
+ nxmutex_destroy(&priv->lock_measure_cycle);
Review Comment:
ditto
##########
drivers/timers/pwm.c:
##########
@@ -602,7 +603,7 @@ int pwm_register(FAR const char *path, FAR struct
pwm_lowerhalf_s *dev)
* kmm_zalloc()).
*/
- nxsem_init(&upper->exclsem, 0, 1);
+ nxmutex_init(&upper->lock);
Review Comment:
ditto. either keep like it is or add error handling if `register_driver`
fails
##########
drivers/timers/rpmsg_rtc.c:
##########
@@ -802,12 +802,12 @@ FAR struct rtc_lowerhalf_s *rpmsg_rtc_server_initialize(
server->ops = &g_rpmsg_rtc_server_ops;
server->lower = lower;
list_initialize(&server->list);
- nxsem_init(&server->exclsem, 0, 1);
+ nxmutex_init(&server->lock);
if (rpmsg_register_callback(server, NULL, NULL,
rpmsg_rtc_server_ns_match,
rpmsg_rtc_server_ns_bind) < 0)
{
- nxsem_destroy(&server->exclsem);
+ nxmutex_destroy(&server->lock);
Review Comment:
ditto
##########
drivers/usbdev/adb.c:
##########
@@ -1462,7 +1463,7 @@ static int usbclass_classobject(int minor,
/* Initialize the char device structure */
- nxsem_init(&alloc->dev.exclsem, 0, 1);
+ nxmutex_init(&alloc->dev.lock);
Review Comment:
ditto
##########
drivers/sensors/hts221.c:
##########
@@ -1168,7 +1169,7 @@ int hts221_register(FAR const char *devpath, FAR struct
i2c_master_s *i2c,
priv->addr = addr;
priv->i2c = i2c;
priv->config = config;
- nxsem_init(&priv->devsem, 0, 1);
+ nxmutex_init(&priv->devlock);
Review Comment:
ditto
##########
drivers/timers/capture.c:
##########
@@ -365,7 +365,7 @@ int cap_register(FAR const char *devpath, FAR struct
cap_lowerhalf_s *lower)
* (it was already zeroed by kmm_zalloc())
*/
- nxsem_init(&upper->exclsem, 0, 1);
+ nxmutex_init(&upper->lock);
Review Comment:
ditto
##########
drivers/sensors/lis2dh.c:
##########
@@ -2046,7 +2047,7 @@ int lis2dh_register(FAR const char *devpath, FAR struct
i2c_master_s *i2c,
return OK;
errout_with_priv:
- nxsem_destroy(&priv->devsem);
+ nxmutex_destroy(&priv->devlock);
Review Comment:
ditto
##########
drivers/sensors/lis3mdl.c:
##########
@@ -610,7 +608,7 @@ int lis3mdl_register(FAR const char *devpath, FAR struct
spi_dev_s *spi,
{
snerr("ERROR: Failed to register driver: %d\n", ret);
kmm_free(priv);
- nxsem_destroy(&priv->datasem);
+ nxmutex_destroy(&priv->datalock);
Review Comment:
ditto. either move this call before `kmm_free` or remove.
additionally add error handling in case if `priv->config->attach` fails
##########
drivers/sensors/kxtj9.c:
##########
@@ -628,7 +628,7 @@ int kxtj9_register(FAR const char *devpath, FAR struct
i2c_master_s *i2c,
priv->i2c = i2c;
priv->address = address;
- nxsem_init(&priv->exclsem, 0, 1);
+ nxmutex_init(&priv->lock);
Review Comment:
ditto
##########
drivers/syslog/ramlog.c:
##########
@@ -786,7 +787,7 @@ int ramlog_register(FAR const char *devpath, FAR char
*buffer, size_t buflen)
{
/* Initialize the non-zero values in the RAM logging device structure */
- nxsem_init(&priv->rl_exclsem, 0, 1);
+ nxmutex_init(&priv->rl_lock);
Review Comment:
ditto
##########
drivers/usbhost/usbhost_hidkbd.c:
##########
@@ -2551,7 +2504,7 @@ int usbhost_kbdinit(void)
{
/* Perform any one-time initialization of the class implementation */
- nxsem_init(&g_exclsem, 0, 1);
+ nxmutex_init(&g_lock);
Review Comment:
ditto. error handling if `usbhost_registerclass` fails
##########
drivers/sensors/lps25h.c:
##########
@@ -749,7 +750,7 @@ int lps25h_register(FAR const char *devpath, FAR struct
i2c_master_s *i2c,
return -ENOMEM;
}
- nxsem_init(&dev->devsem, 0, 1);
+ nxmutex_init(&dev->devlock);
Review Comment:
ditto
##########
drivers/sensors/lsm330_spi.c:
##########
@@ -1425,7 +1421,7 @@ int lsm330_register(FAR const char *devpath_acl,
* accelerometer instance.
*/
- nxsem_destroy(&priva->datasem);
+ nxmutex_destroy(&priva->devicelock);
Review Comment:
ditto
##########
drivers/sensors/lsm330_spi.c:
##########
@@ -1370,7 +1367,7 @@ int lsm330_register(FAR const char *devpath_acl,
priv->flink = g_lsm330a_list;
g_lsm330a_list = priv;
priva = priv;
- config_acl->leaf_handle = (void *) priv;
+ config_acl->leaf_handle = (void *)priv;
Review Comment:
style change. seems that should be removed from this PR
##########
drivers/usbmisc/fusb301.c:
##########
@@ -805,7 +806,7 @@ int fusb301_register(FAR const char *devpath, FAR struct
i2c_master_s *i2c,
return OK;
errout_with_priv:
- nxsem_destroy(&priv->devsem);
+ nxmutex_destroy(&priv->devlock);
Review Comment:
ditto
##########
drivers/sensors/scd30.c:
##########
@@ -1059,7 +1060,7 @@ int scd30_register_i2c(FAR const char *devpath, FAR
struct i2c_master_s *i2c,
priv->altitude_comp = SCD30_DEFAULT_ALTITUDE_COMPENSATION;
priv->temperature_offset = SCD30_DEFAULT_TEMPERATURE_OFFSET;
- nxsem_init(&priv->devsem, 0, 1);
+ nxmutex_init(&priv->devlock);
Review Comment:
ditto
##########
drivers/sensors/max44009.c:
##########
@@ -889,7 +890,7 @@ int max44009_register(FAR const char *devpath, FAR struct
i2c_master_s *i2c,
priv->addr = addr;
priv->i2c = i2c;
priv->config = config;
- nxsem_init(&priv->dev_sem, 0, 1);
+ nxmutex_init(&priv->dev_lock);
Review Comment:
ditto
##########
drivers/sensors/sgp30.c:
##########
@@ -1060,7 +1061,7 @@ int sgp30_register(FAR const char *devpath, FAR struct
i2c_master_s *i2c,
priv->i2c = i2c;
priv->addr = addr;
- nxsem_init(&priv->devsem, 0, 1);
+ nxmutex_init(&priv->devlock);
Review Comment:
ditto
##########
drivers/sensors/sht3x.c:
##########
@@ -678,7 +679,7 @@ int sht3x_register(FAR const char *devpath, FAR struct
i2c_master_s *i2c,
priv->i2c = i2c;
priv->addr = addr;
- nxsem_init(&priv->devsem, 0, 1);
+ nxmutex_init(&priv->devlock);
Review Comment:
ditto
##########
drivers/sensors/sht21.c:
##########
@@ -661,7 +662,7 @@ int sht21_register(FAR const char *devpath, FAR struct
i2c_master_s *i2c,
priv->i2c = i2c;
priv->addr = addr;
- nxsem_init(&priv->devsem, 0, 1);
+ nxmutex_init(&priv->devlock);
Review Comment:
ditto
##########
drivers/video/video.c:
##########
@@ -3094,9 +3067,9 @@ static FAR void *video_register(FAR const char *devpath)
memcpy(priv->devpath, devpath, allocsize);
priv->devpath[allocsize] = '\0';
- /* Initialize semaphore */
+ /* Initialize mutex */
- nxsem_init(&priv->lock_open_num, 0, 1);
+ nxmutex_init(&priv->lock_open_num);
Review Comment:
ditto
##########
drivers/serial/serial.c:
##########
@@ -1683,14 +1659,14 @@ int uart_register(FAR const char *path, FAR uart_dev_t
*dev)
}
#endif
- /* Initialize semaphores */
+ /* Initialize mutex & semaphores */
- nxsem_init(&dev->xmit.sem, 0, 1);
- nxsem_init(&dev->recv.sem, 0, 1);
- nxsem_init(&dev->closesem, 0, 1);
+ nxmutex_init(&dev->xmit.lock);
+ nxmutex_init(&dev->recv.lock);
+ nxmutex_init(&dev->closelock);
nxsem_init(&dev->xmitsem, 0, 0);
nxsem_init(&dev->recvsem, 0, 0);
- nxsem_init(&dev->pollsem, 0, 1);
+ nxmutex_init(&dev->polllock);
Review Comment:
ditto. either keep like it is or call `nxmutex_destroy` + `nxsem_destroy` if
`register_driver` fails
##########
drivers/wireless/gs2200m.c:
##########
@@ -3522,7 +3504,7 @@ FAR void *gs2200m_register(FAR const char *devpath,
dev->path = strdup(devpath);
dev->lower = lower;
- nxsem_init(&dev->dev_sem, 0, 1);
+ nxmutex_init(&dev->dev_lock);
Review Comment:
ditto
##########
drivers/sensors/usensor.c:
##########
@@ -232,19 +232,19 @@ int usensor_initialize(void)
return -ENOMEM;
}
- nxsem_init(&usensor->exclsem, 0, 1);
+ nxmutex_init(&usensor->lock);
list_initialize(&usensor->list);
ret = register_driver(USENSOR_PATH, &g_usensor_fops, 0666, usensor);
if (ret < 0)
{
- goto errout_with_sem;
+ goto errout_with_lock;
}
return ret;
-errout_with_sem:
- nxsem_destroy(&usensor->exclsem);
+errout_with_lock:
+ nxmutex_destroy(&usensor->lock);
Review Comment:
ditto
##########
drivers/wireless/lpwan/sx127x/sx127x.c:
##########
@@ -4589,15 +4589,15 @@ int sx127x_register(FAR struct spi_dev_s *spi,
dev->pfd = NULL;
- /* Initialize sem */
+ /* Initialize mutex & sem */
- nxsem_init(&dev->dev_sem, 0, 1);
+ nxmutex_init(&dev->dev_lock);
Review Comment:
ditto. add vs not add `nxmutex_destroy` and `nxsem_destroy` if
`register_driver` fails
##########
drivers/sensors/sps30.c:
##########
@@ -1073,7 +1074,7 @@ int sps30_register_i2c(FAR const char *devpath, FAR
struct i2c_master_s *i2c,
priv->addr = addr;
priv->started = false;
- nxsem_init(&priv->devsem, 0, 1);
+ nxmutex_init(&priv->devlock);
Review Comment:
ditto
##########
drivers/spi/spi_slave_driver.c:
##########
@@ -604,7 +605,7 @@ int spi_slave_register(FAR struct spi_slave_ctrlr_s *ctrlr,
int bus)
#endif
#ifndef CONFIG_DISABLE_PSEUDOFS_OPERATIONS
- nxsem_init(&priv->exclsem, 0, 1);
+ nxmutex_init(&priv->lock);
Review Comment:
ditto
##########
drivers/timers/rtc.c:
##########
@@ -853,7 +853,7 @@ int rtc_initialize(int minor, FAR struct rtc_lowerhalf_s
*lower)
ret = register_driver(devpath, &rtc_fops, 0666, upper);
if (ret < 0)
{
- nxsem_destroy(&upper->exclsem);
+ nxmutex_destroy(&upper->lock);
Review Comment:
ditto
##########
drivers/wireless/ieee80211/bcm43xxx/bcmf_gspi.c:
##########
@@ -856,7 +856,7 @@ static int bcmf_bus_gspi_initialize(FAR struct bcmf_dev_s
*priv,
/* Init transmit frames queue */
- if ((ret = nxsem_init(&gbus->queue_mutex, 0, 1)) != OK)
+ if ((ret = nxmutex_init(&gbus->queue_lock)) != OK)
Review Comment:
ditto
##########
drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c:
##########
@@ -674,7 +674,7 @@ static int bcmf_bus_sdio_initialize(FAR struct bcmf_dev_s
*priv,
/* Init transmit frames queue */
- if ((ret = nxsem_init(&sbus->queue_mutex, 0, 1)) != OK)
+ if ((ret = nxmutex_init(&sbus->queue_lock)) != OK)
Review Comment:
ditto
##########
drivers/video/vnc/vnc_updater.c:
##########
@@ -48,6 +48,9 @@
#include <debug.h>
#include <nuttx/queue.h>
+#ifdef VNCSERVER_SEM_DEBUG
+#include <nuttx/mutex.h>
Review Comment:
```suggestion
# include <nuttx/mutex.h>
```
##########
drivers/wireless/nrf24l01.c:
##########
@@ -1489,7 +1490,7 @@ int nrf24l01_register(FAR struct spi_dev_s *spi,
dev->rx_fifo = rx_fifo;
- nxsem_init(&(dev->sem_fifo), 0, 1);
+ nxmutex_init(&dev->lock_fifo);
Review Comment:
ditto
##########
fs/nfs/nfs_vfsops.c:
##########
@@ -2035,13 +2014,13 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR
const void *data,
/* Initialize the allocated mountpt state structure. */
- /* Initialize the semaphore that controls access. The initial count
- * is zero, but nfs_semgive() is called at the completion of
+ /* Initialize the mutex that controls access.
+ * nxmutex_lock() is called at the completion of
* initialization, incrementing the count to one.
*/
- nxsem_init(&nmp->nm_sem, 0, 0); /* Initialize the semaphore that
- * controls access */
+ nxmutex_init(&nmp->nm_lock); /* Initialize the mutex that
Review Comment:
ditto. do we need to `nxmutex_destroy(&nmp->nm_lock);` if `rpc = (FAR struct
rpcclnt *)kmm_zalloc(sizeof(struct rpcclnt));` fails
##########
wireless/pktradio/pktradio_metadata.c:
##########
@@ -49,7 +49,7 @@ static FAR struct pktradio_metadata_s *g_free_metadata;
/* Supports mutually exclusive access to the free list */
-static sem_t g_metadata_sem;
+static mutex_t g_metadata_lock;
Review Comment:
```suggestion
static mutex_t g_metadata_lock = NXMUTEX_INITIALIZER;
```
##########
fs/rpmsgfs/rpmsgfs_server.c:
##########
@@ -849,14 +850,14 @@ static void rpmsgfs_ns_bind(FAR struct rpmsg_device *rdev,
}
priv->ept.priv = priv;
- nxsem_init(&priv->sem, 0, 1);
+ nxmutex_init(&priv->lock);
ret = rpmsg_create_ept(&priv->ept, rdev, name,
RPMSG_ADDR_ANY, dest,
rpmsgfs_ept_cb, rpmsgfs_ns_unbind);
if (ret)
{
- nxsem_destroy(&priv->sem);
+ nxmutex_destroy(&priv->lock);
Review Comment:
ditto
##########
drivers/wireless/spirit/drivers/spirit_netdev.c:
##########
@@ -2744,8 +2635,8 @@ int spirit_netdev_initialize(FAR struct spi_dev_s *spi,
/* Attach the interface, lower driver, and devops */
priv->lower = lower;
- nxsem_init(&priv->rxsem, 0, 1); /* Access to RX packet queue */
- nxsem_init(&priv->txsem, 0, 1); /* Access to TX packet queue */
+ nxmutex_init(&priv->rxlock); /* Access to RX packet queue */
+ nxmutex_init(&priv->txlock); /* Access to TX packet queue */
Review Comment:
ditto. add vs not add `nxmutex_destroy` at `errout_with_alloc`
##########
wireless/ieee802154/mac802154_netdev.c:
##########
@@ -1266,9 +1267,9 @@ int mac802154netdev_register(MACHANDLE mac)
dev->d_private = priv; /* Used to recover private state
from dev */
priv->md_mac = mac; /* Save the MAC interface instance
*/
- /* Setup a locking semaphore for exclusive device driver access */
+ /* Setup a locking mutex for exclusive device driver access */
- nxsem_init(&priv->md_exclsem, 0, 1);
+ nxmutex_init(&priv->md_lock);
Review Comment:
ditto. `nxmutex_destroy` call at `errout`
##########
drivers/wireless/cc1101.c:
##########
@@ -1489,8 +1478,8 @@ int cc1101_register(FAR const char *path, FAR struct
cc1101_dev_s *dev)
dev->nxt_read = 0;
dev->nxt_write = 0;
dev->fifo_len = 0;
- nxsem_init(&(dev->devsem), 0, 1);
- nxsem_init(&(dev->sem_rx_buffer), 0, 1);
+ nxmutex_init(&dev->devlock);
+ nxmutex_init(&dev->lock_rx_buffer);
nxsem_init(&(dev->sem_rx), 0, 0);
nxsem_init(&(dev->sem_tx), 0, 0);
Review Comment:
ditto. also probably need to add `kmm_free` if `register_driver` fails
##########
fs/nxffs/nxffs_initialize.c:
##########
@@ -171,7 +171,7 @@ int nxffs_initialize(FAR struct mtd_dev_s *mtd)
volume->mtd = mtd;
volume->cblock = (off_t)-1;
- nxsem_init(&volume->exclsem, 0, 1);
+ nxmutex_init(&volume->lock);
Review Comment:
ditto
##########
libs/libc/wqueue/work_usrthread.c:
##########
@@ -281,7 +280,7 @@ int work_usrstart(void)
/* Set up the work queue lock */
- _SEM_INIT(&g_usrwork.lock, 0, 1);
+ nxmutex_init(&g_usrwork.lock);
Review Comment:
ditto. do we need to call `nxmutex_destroy` + `_SEM_DESTROY` if
`task_create` fails
##########
wireless/bluetooth/bt_ioctl.c:
##########
@@ -628,7 +629,7 @@ int btnet_ioctl(FAR struct net_driver_s *netdev, int cmd,
unsigned long arg)
if (ret < 0)
{
- nxsem_destroy(&g_scanstate.bs_exclsem);
+ nxmutex_destroy(&g_scanstate.bs_lock);
Review Comment:
ditto
##########
wireless/ieee802154/mac802154_device.c:
##########
@@ -904,7 +886,7 @@ int mac802154dev_register(MACHANDLE mac, int minor)
return OK;
errout_with_priv:
- nxsem_destroy(&dev->md_exclsem);
+ nxmutex_destroy(&dev->md_lock);
Review Comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
