michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers, net: Clean up semaphore initialization

Browse source 
Change the common "init with 0" + "give" idiom to "init with 1".  This
won't change the behavior or performance, but should decrease the size
ever so slightly.

This change has been performed mechanically with the following
Coccinelle script:

    @@
    expression SEM;
    expression LIMIT;
    expression TIMEOUT;
    @@

    - k_sem_init(SEM, 0, LIMIT);
    - k_sem_give(SEM);
    + k_sem_init(SEM, 1, LIMIT);

Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
This commit is contained in:
Leandro Pereira 2017-07-27 10:59:06 -07:00 • committed by Anas Nashif
commit 732424f065
22 changed files with 23 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/adc/adc_qmsi.c
View file

@ -240,8 +240,7 @@ static int adc_qmsi_init(struct device *dev)
k_sem_init(&info->device_sync_sem, 0, UINT_MAX);
k_sem_init(&info->sem, 0, UINT_MAX);
k_sem_give(&info->sem);
k_sem_init(&info->sem, 1, UINT_MAX);
info->state = ADC_STATE_IDLE;
adc_config_irq();

3
drivers/adc/adc_qmsi_ss.c
View file

@ -308,8 +308,7 @@ static int adc_qmsi_ss_init(struct device *dev)
ss_clk_adc_set_div(CONFIG_ADC_QMSI_CLOCK_RATIO);
k_sem_init(&info->device_sync_sem, 0, UINT_MAX);
k_sem_init(&info->sem, 0, UINT_MAX);
k_sem_give(&info->sem);
k_sem_init(&info->sem, 1, UINT_MAX);
info->state = ADC_STATE_IDLE;
adc_config_irq();

3
drivers/counter/counter_qmsi_aonpt.c
View file

@ -229,8 +229,7 @@ static int aon_timer_init(struct device *dev)
QM_IR_UNMASK_INTERRUPTS(QM_INTERRUPT_ROUTER->aonpt_0_int_mask);
if (IS_ENABLED(CONFIG_AON_API_REENTRANCY)) {
k_sem_init(RP_GET(dev), 0, UINT_MAX);
k_sem_give(RP_GET(dev));
k_sem_init(RP_GET(dev), 1, UINT_MAX);
}
aonpt_qmsi_set_power_state(dev, DEVICE_PM_ACTIVE_STATE);

3
drivers/crypto/crypto_ataes132a.c
View file

@ -183,8 +183,7 @@ int ataes132a_init(struct device *dev)
i2c_configure(ataes132a->i2c, i2c_cfg.raw);
k_sem_init(&ataes132a->device_sem, 0, UINT_MAX);
k_sem_give(&ataes132a->device_sem);
k_sem_init(&ataes132a->device_sem, 1, UINT_MAX);
ataes132a_init_states();

3
drivers/ethernet/eth_enc28j60.c
View file

@ -337,8 +337,7 @@ static int eth_enc28j60_init(struct device *dev)
struct eth_enc28j60_runtime *context = dev->driver_data;
struct spi_config spi_cfg;
k_sem_init(&context->spi_sem, 0, UINT_MAX);
k_sem_give(&context->spi_sem);
k_sem_init(&context->spi_sem, 1, UINT_MAX);
context->gpio = device_get_binding((char *)config->gpio_port);
if (!context->gpio) {

3
drivers/flash/soc_flash_qmsi.c
View file

@ -330,8 +330,7 @@ static int quark_flash_init(struct device *dev)
#endif
if (IS_ENABLED(CONFIG_SOC_FLASH_QMSI_API_REENTRANCY)) {
k_sem_init(RP_GET(dev), 0, UINT_MAX);
k_sem_give(RP_GET(dev));
k_sem_init(RP_GET(dev), 1, UINT_MAX);
}
flash_qmsi_set_power_state(dev, DEVICE_PM_ACTIVE_STATE);

3
drivers/flash/spi_flash_w25qxxdv.c
View file

@ -359,8 +359,7 @@ static int spi_flash_init(struct device *dev)
data->spi = spi_dev;
k_sem_init(&data->sem, 0, UINT_MAX);
k_sem_give(&data->sem);
k_sem_init(&data->sem, 1, UINT_MAX);
ret = spi_flash_wb_config(dev);
if (!ret) {

3
drivers/gpio/gpio_qmsi.c
View file

@ -369,8 +369,7 @@ static int gpio_qmsi_init(struct device *port)
const struct gpio_qmsi_config *gpio_config = port->config->config_info;
if (IS_ENABLED(CONFIG_GPIO_QMSI_API_REENTRANCY)) {
k_sem_init(RP_GET(port), 0, UINT_MAX);
k_sem_give(RP_GET(port));
k_sem_init(RP_GET(port), 1, UINT_MAX);
}
switch (gpio_config->gpio) {

3
drivers/gpio/gpio_qmsi_ss.c
View file

@ -368,8 +368,7 @@ static int ss_gpio_qmsi_init(struct device *port)
u32_t *scss_intmask = NULL;
if (IS_ENABLED(CONFIG_GPIO_QMSI_API_REENTRANCY)) {
k_sem_init(RP_GET(port), 0, UINT_MAX);
k_sem_give(RP_GET(port));
k_sem_init(RP_GET(port), 1, UINT_MAX);
}
switch (gpio_config->gpio) {

3
drivers/i2c/i2c_qmsi.c
View file

@ -261,8 +261,7 @@ static int i2c_qmsi_init(struct device *dev)
int err;
k_sem_init(&driver_data->device_sync_sem, 0, UINT_MAX);
k_sem_init(&driver_data->sem, 0, UINT_MAX);
k_sem_give(&driver_data->sem);
k_sem_init(&driver_data->sem, 1, UINT_MAX);
switch (instance) {
case QM_I2C_0:

3
drivers/i2c/i2c_qmsi_ss.c
View file

@ -350,8 +350,7 @@ static int i2c_qmsi_ss_init(struct device *dev)
config->irq_cfg();
ss_clk_i2c_enable(instance);
k_sem_init(&driver_data->sem, 0, UINT_MAX);
k_sem_give(&driver_data->sem);
k_sem_init(&driver_data->sem, 1, UINT_MAX);
err = i2c_qmsi_ss_configure(dev, config->default_cfg.raw);

3
drivers/ieee802154/ieee802154_mcr20a.c
View file

@ -1408,8 +1408,7 @@ static int mcr20a_init(struct device *dev)
{
struct mcr20a_context *mcr20a = dev->driver_data;
k_sem_init(&mcr20a->spi.spi_sem, 0, UINT_MAX);
k_sem_give(&mcr20a->spi.spi_sem);
k_sem_init(&mcr20a->spi.spi_sem, 1, UINT_MAX);
k_mutex_init(&mcr20a->phy_mutex);
k_sem_init(&mcr20a->isr_sem, 0, 1);

3
drivers/pwm/pwm_qmsi.c
View file

@ -206,8 +206,7 @@ static int pwm_qmsi_init(struct device *dev)
clk_periph_enable(CLK_PERIPH_PWM_REGISTER | CLK_PERIPH_CLK);
if (IS_ENABLED(CONFIG_PWM_QMSI_API_REENTRANCY)) {
k_sem_init(RP_GET(dev), 0, UINT_MAX);
k_sem_give(RP_GET(dev));
k_sem_init(RP_GET(dev), 1, UINT_MAX);
}
pwm_qmsi_set_power_state(dev, DEVICE_PM_ACTIVE_STATE);

3
drivers/rtc/rtc_qmsi.c
View file

@ -139,8 +139,7 @@ static const struct rtc_driver_api api = {
static int rtc_qmsi_init(struct device *dev)
{
if (IS_ENABLED(CONFIG_RTC_QMSI_API_REENTRANCY)) {
k_sem_init(RP_GET(dev), 0, UINT_MAX);
k_sem_give(RP_GET(dev));
k_sem_init(RP_GET(dev), 1, UINT_MAX);
}
IRQ_CONNECT(IRQ_GET_NUMBER(QM_IRQ_RTC_0_INT), CONFIG_RTC_0_IRQ_PRI,

3
drivers/sensor/bmg160/bmg160.c
View file

@ -281,8 +281,7 @@ int bmg160_init(struct device *dev)
return -EINVAL;
}
k_sem_init(&bmg160->sem, 0, UINT_MAX);
k_sem_give(&bmg160->sem);
k_sem_init(&bmg160->sem, 1, UINT_MAX);
if (bmg160_read_byte(dev, BMG160_REG_CHIPID, &chip_id) < 0) {
SYS_LOG_DBG("Failed to read chip id.");

3
drivers/sensor/fxas21002/fxas21002.c
View file

@ -265,8 +265,7 @@ static int fxas21002_init(struct device *dev)
k_busy_wait(transition_time);
k_sem_init(&data->sem, 0, UINT_MAX);
k_sem_give(&data->sem);
k_sem_init(&data->sem, 1, UINT_MAX);
SYS_LOG_DBG("Init complete");

3
drivers/sensor/fxos8700/fxos8700.c
View file

@ -345,8 +345,7 @@ static int fxos8700_init(struct device *dev)
return -EIO;
}
k_sem_init(&data->sem, 0, UINT_MAX);
k_sem_give(&data->sem);
k_sem_init(&data->sem, 1, UINT_MAX);
SYS_LOG_DBG("Init complete");

3
drivers/spi/spi_qmsi.c
View file

@ -291,8 +291,7 @@ static int spi_qmsi_init(struct device *dev)
context->gpio_cs = gpio_cs_init(spi_config);
k_sem_init(&context->device_sync_sem, 0, UINT_MAX);
k_sem_init(&context->sem, 0, UINT_MAX);
k_sem_give(&context->sem);
k_sem_init(&context->sem, 1, UINT_MAX);
spi_master_set_power_state(dev, DEVICE_PM_ACTIVE_STATE);

3
drivers/spi/spi_qmsi_ss.c
View file

@ -450,8 +450,7 @@ static int ss_spi_qmsi_init(struct device *dev)
context->gpio_cs = gpio_cs_init(spi_config);
#endif
k_sem_init(&context->device_sync_sem, 0, UINT_MAX);
k_sem_init(&context->sem, 0, UINT_MAX);
k_sem_give(&context->sem);
k_sem_init(&context->sem, 1, UINT_MAX);
ss_spi_master_set_power_state(dev, DEVICE_PM_ACTIVE_STATE);

3
drivers/watchdog/wdt_qmsi.c
View file

@ -169,8 +169,7 @@ static int wdt_qmsi_device_ctrl(struct device *dev, u32_t ctrl_command,
static int init(struct device *dev)
{
if (IS_ENABLED(CONFIG_WDT_QMSI_API_REENTRANCY)) {
k_sem_init(RP_GET(dev), 0, UINT_MAX);
k_sem_give(RP_GET(dev));
k_sem_init(RP_GET(dev), 1, UINT_MAX);
}
IRQ_CONNECT(IRQ_GET_NUMBER(QM_IRQ_WDT_0_INT), CONFIG_WDT_0_IRQ_PRI,

7
subsys/net/ip/net_context.c
View file

@ -554,8 +554,7 @@ int net_context_get(sa_family_t family,
#endif
#if defined(CONFIG_NET_CONTEXT_SYNC_RECV)
k_sem_init(&contexts[i].recv_data_wait, 0, UINT_MAX);
k_sem_give(&contexts[i].recv_data_wait);
k_sem_init(&contexts[i].recv_data_wait, 1, UINT_MAX);
#endif /* CONFIG_NET_CONTEXT_SYNC_RECV */
*context = &contexts[i];
@ -2446,7 +2445,5 @@ void net_context_foreach(net_context_cb_t cb, void *user_data)
void net_context_init(void)
{
k_sem_init(&contexts_lock, 0, UINT_MAX);
k_sem_give(&contexts_lock);
k_sem_init(&contexts_lock, 1, UINT_MAX);
}

3
tests/kernel/obj_tracing/src/main.c
View file

@ -25,8 +25,7 @@ int main(void)
int i;
for (i = 0; i < N_PHILOSOPHERS; i++) {
k_sem_init(&forks[i], 0, 1);
k_sem_give(&forks[i]);
k_sem_init(&forks[i], 1, 1);
}
/* create philosopher threads */