diff --git a/drivers/clock_control/clock_control_litex.c b/drivers/clock_control/clock_control_litex.c index c5c4f847bf8..1d16db30a34 100644 --- a/drivers/clock_control/clock_control_litex.c +++ b/drivers/clock_control/clock_control_litex.c @@ -386,10 +386,11 @@ static void litex_clk_check_DO(char *reg_name, uint8_t clk_reg_addr, int ret; ret = litex_clk_get_DO(clk_reg_addr, res); - if (ret != 0) + if (ret != 0) { LOG_ERR("%s: read error: %d", reg_name, ret); - else + } else { LOG_DBG("%s: 0x%x", reg_name, *res); + } } static void litex_clk_print_general_regs(void) diff --git a/drivers/clock_control/clock_control_mcux_ccm.c b/drivers/clock_control/clock_control_mcux_ccm.c index 72f1afaae39..8ff09672352 100644 --- a/drivers/clock_control/clock_control_mcux_ccm.c +++ b/drivers/clock_control/clock_control_mcux_ccm.c @@ -307,10 +307,11 @@ static int mcux_ccm_get_subsys_rate(const struct device *dev, { uint32_t mux = CLOCK_GetRootMux(kCLOCK_RootGpt1); - if (mux == 0) + if (mux == 0) { *rate = OSC24M_CLK_FREQ; - else + } else { *rate = 0; + } } break; #endif #endif diff --git a/drivers/clock_control/clock_control_npcx.c b/drivers/clock_control/clock_control_npcx.c index b41fb9d42c4..0a8b6f0e10f 100644 --- a/drivers/clock_control/clock_control_npcx.c +++ b/drivers/clock_control/clock_control_npcx.c @@ -130,8 +130,9 @@ void npcx_clock_control_turn_on_system_sleep(bool is_deep, bool is_instant) if (is_deep) { pm_flags |= BIT(NPCX_PMCSR_DHF); /* Add 'Instant Wake-up' flag if sleep time is within 200 ms */ - if (is_instant) + if (is_instant) { pm_flags |= BIT(NPCX_PMCSR_DI_INSTW); + } } inst_pmc->PMCSR = pm_flags; diff --git a/drivers/counter/counter_mcux_tpm.c b/drivers/counter/counter_mcux_tpm.c index 089629d2b5b..a2f189e59f7 100644 --- a/drivers/counter/counter_mcux_tpm.c +++ b/drivers/counter/counter_mcux_tpm.c @@ -86,18 +86,21 @@ static int mcux_tpm_set_alarm(const struct device *dev, uint8_t chan_id, return -EINVAL; } - if (ticks > (top_value)) + if (ticks > (top_value)) { return -EINVAL; - - if ((alarm_cfg->flags & COUNTER_ALARM_CFG_ABSOLUTE) == 0) { - if (top_value - current >= ticks) - ticks += current; - else - ticks -= top_value - current; } - if (data->alarm_callback) + if ((alarm_cfg->flags & COUNTER_ALARM_CFG_ABSOLUTE) == 0) { + if (top_value - current >= ticks) { + ticks += current; + } else { + ticks -= top_value - current; + } + } + + if (data->alarm_callback) { return -EBUSY; + } data->alarm_callback = alarm_cfg->callback; data->alarm_user_data = alarm_cfg->user_data; @@ -163,8 +166,9 @@ static int mcux_tpm_set_top_value(const struct device *dev, TPM_Type *base = get_base(dev); struct mcux_tpm_data *data = dev->data; - if (data->alarm_callback) + if (data->alarm_callback) { return -EBUSY; + } /* Check if timer already enabled. */ #if defined(FSL_FEATURE_TPM_HAS_SC_CLKS) && FSL_FEATURE_TPM_HAS_SC_CLKS @@ -173,8 +177,9 @@ static int mcux_tpm_set_top_value(const struct device *dev, if (base->SC & TPM_SC_CMOD_MASK) { #endif /* Timer already enabled, check flags before resetting */ - if (cfg->flags & COUNTER_TOP_CFG_DONT_RESET) + if (cfg->flags & COUNTER_TOP_CFG_DONT_RESET) { return -ENOTSUP; + } TPM_StopTimer(base); base->CNT = 0; diff --git a/drivers/dai/intel/dmic/dmic.c b/drivers/dai/intel/dmic/dmic.c index a0dd9649101..b0d44d4da55 100644 --- a/drivers/dai/intel/dmic/dmic.c +++ b/drivers/dai/intel/dmic/dmic.c @@ -519,12 +519,14 @@ static void dai_dmic_gain_ramp(struct dai_intel_dmic *dmic) /* Write gain to registers */ for (i = 0; i < CONFIG_DAI_DMIC_HW_CONTROLLERS; i++) { - if (!dmic->enable[i]) + if (!dmic->enable[i]) { continue; + } - if (dmic->startcount == DMIC_UNMUTE_CIC) + if (dmic->startcount == DMIC_UNMUTE_CIC) { dai_dmic_update_bits(dmic, dmic_base[i] + CIC_CONTROL, CIC_CONTROL_MIC_MUTE, 0); + } if (dmic->startcount == DMIC_UNMUTE_FIR) { dai_dmic_update_bits(dmic, dmic_base[i] + FIR_CHANNEL_REGS_SIZE * @@ -563,8 +565,9 @@ static void dai_dmic_start(struct dai_intel_dmic *dmic) key = k_spin_lock(&dmic->lock); #ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE - for (i = 0; i < CONFIG_DAI_DMIC_HW_CONTROLLERS; i++) + for (i = 0; i < CONFIG_DAI_DMIC_HW_CONTROLLERS; i++) { dai_dmic_update_bits(dmic, dmic_base[i] + CIC_CONTROL, CIC_CONTROL_SOFT_RESET, 0); + } #endif dmic->startcount = 0; diff --git a/drivers/dai/intel/dmic/dmic.h b/drivers/dai/intel/dmic/dmic.h index f11b72b5a1e..c507ec1c0ee 100644 --- a/drivers/dai/intel/dmic/dmic.h +++ b/drivers/dai/intel/dmic/dmic.h @@ -185,12 +185,13 @@ struct dai_intel_dmic { static inline int32_t sat_int32(int64_t x) { - if (x > INT32_MAX) + if (x > INT32_MAX) { return INT32_MAX; - else if (x < INT32_MIN) + } else if (x < INT32_MIN) { return INT32_MIN; - else + } else { return (int32_t)x; + } } /* Fractional multiplication with shift and saturation */ static inline int32_t q_multsr_sat_32x32(int32_t x, int32_t y, diff --git a/drivers/dai/intel/dmic/dmic_nhlt.c b/drivers/dai/intel/dmic/dmic_nhlt.c index 1512d6e4b46..f71b0d47f2f 100644 --- a/drivers/dai/intel/dmic/dmic_nhlt.c +++ b/drivers/dai/intel/dmic/dmic_nhlt.c @@ -182,17 +182,19 @@ static int dai_ipm_source_to_enable(struct dai_intel_dmic *dmic, { int mic_swap; - if (source_pdm >= CONFIG_DAI_DMIC_HW_CONTROLLERS) + if (source_pdm >= CONFIG_DAI_DMIC_HW_CONTROLLERS) { return -EINVAL; + } if (*count < pdm_count) { (*count)++; mic_swap = FIELD_GET(MIC_CONTROL_CLK_EDGE, dai_dmic_read( dmic, dmic_base[source_pdm] + MIC_CONTROL)); - if (stereo) + if (stereo) { dmic->enable[source_pdm] = 0x3; /* PDMi MIC A and B */ - else + } else { dmic->enable[source_pdm] = mic_swap ? 0x2 : 0x1; /* PDMi MIC B or MIC A */ + } } return 0; @@ -234,8 +236,9 @@ static int dai_nhlt_dmic_dai_params_get(struct dai_intel_dmic *dmic, const int c stereo_pdm = FIELD_GET(OUTCONTROL_IPM_SOURCE_MODE, outcontrol_val); dmic->dai_config_params.channels = (stereo_pdm + 1) * num_pdm; - for (n = 0; n < CONFIG_DAI_DMIC_HW_CONTROLLERS; n++) + for (n = 0; n < CONFIG_DAI_DMIC_HW_CONTROLLERS; n++) { dmic->enable[n] = 0; + } n = 0; source_pdm = FIELD_GET(OUTCONTROL_IPM_SOURCE_1, outcontrol_val); diff --git a/drivers/dai/intel/ssp/ssp.c b/drivers/dai/intel/ssp/ssp.c index 532bdc877e9..a11f03ce4db 100644 --- a/drivers/dai/intel/ssp/ssp.c +++ b/drivers/dai/intel/ssp/ssp.c @@ -502,11 +502,12 @@ static int dai_ssp_find_bclk_source(struct dai_intel_ssp *dp, uint32_t bclk, uin } /* searching the smallest possible bclk source */ - for (i = 0; i <= DAI_INTEL_SSP_MAX_FREQ_INDEX; i++) + for (i = 0; i <= DAI_INTEL_SSP_MAX_FREQ_INDEX; i++) { if (ft[i].freq % bclk == 0) { *scr_div = ft[i].freq / bclk; return i; } + } /* check if we can get target BCLK with M/N */ for (i = 0; i <= DAI_INTEL_SSP_MAX_FREQ_INDEX; i++) { @@ -958,8 +959,9 @@ static void ssp_empty_rx_fifo_on_start(struct dai_intel_ssp *dp) if (sssr & SSSR_ROR) { /* The RX FIFO is in overflow condition, empty it */ for (uint32_t idx = 0; idx < I2SIPCMC; ++idx) { - for (i = 0; i < DAI_INTEL_SSP_FIFO_DEPTH; i++) + for (i = 0; i < DAI_INTEL_SSP_FIFO_DEPTH; i++) { sys_read32(dai_base(dp) + SSMIDyD(idx)); + } } /* Clear the overflow status */ @@ -974,8 +976,9 @@ static void ssp_empty_rx_fifo_on_start(struct dai_intel_ssp *dp) SSMIDyCS(idx))); /* Empty the RX FIFO (the DMA is not running at this point) */ - for (i = 0; i < entries + 1; i++) + for (i = 0; i < entries + 1; i++) { sys_read32(dai_base(dp) + SSMIDyD(idx)); + } sssr = sys_read32(dai_base(dp) + SSSR); } @@ -1017,8 +1020,9 @@ static void ssp_empty_rx_fifo_on_stop(struct dai_intel_ssp *dp) * directly, otherwise let the next loop iteration to * check the status */ - for (i = 0; i < entries[1] + 1; i++) + for (i = 0; i < entries[1] + 1; i++) { sys_read32(dai_base(dp) + SSMIDyD(dp->tdm_slot_group)); + } } sssr = sys_read32(dai_base(dp) + SSSR); } @@ -1037,8 +1041,9 @@ static void ssp_empty_rx_fifo_on_start(struct dai_intel_ssp *dp) if (sssr & SSSR_ROR) { /* The RX FIFO is in overflow condition, empty it */ - for (i = 0; i < DAI_INTEL_SSP_FIFO_DEPTH; i++) + for (i = 0; i < DAI_INTEL_SSP_FIFO_DEPTH; i++) { sys_read32(dai_base(dp) + SSDR); + } /* Clear the overflow status */ dai_ssp_update_bits(dp, SSSR, SSSR_ROR, SSSR_ROR); @@ -1050,8 +1055,9 @@ static void ssp_empty_rx_fifo_on_start(struct dai_intel_ssp *dp) uint32_t entries = SSCR3_RFL_VAL(sys_read32(dai_base(dp) + SSCR3)); /* Empty the RX FIFO (the DMA is not running at this point) */ - for (i = 0; i < entries + 1; i++) + for (i = 0; i < entries + 1; i++) { sys_read32(dai_base(dp) + SSDR); + } sssr = sys_read32(dai_base(dp) + SSSR); } @@ -1088,8 +1094,9 @@ static void ssp_empty_rx_fifo_on_stop(struct dai_intel_ssp *dp) * directly, otherwise let the next loop iteration to * check the status */ - for (i = 0; i < entries[1] + 1; i++) + for (i = 0; i < entries[1] + 1; i++) { sys_read32(dai_base(dp) + SSDR); + } } sssr = sys_read32(dai_base(dp) + SSSR); diff --git a/drivers/dma/dma_intel_adsp_gpdma.c b/drivers/dma/dma_intel_adsp_gpdma.c index 5e3850244d9..3ccb08675df 100644 --- a/drivers/dma/dma_intel_adsp_gpdma.c +++ b/drivers/dma/dma_intel_adsp_gpdma.c @@ -72,15 +72,17 @@ static void intel_adsp_gpdma_dump_registers(const struct device *dev, uint32_t c channel, cap, ctl, ipptr, llpc, llpl, llpu); /* Channel Register Dump */ - for (i = 0; i <= DW_DMA_CHANNEL_REGISTER_OFFSET_END; i += 0x8) + for (i = 0; i <= DW_DMA_CHANNEL_REGISTER_OFFSET_END; i += 0x8) { LOG_INF(" channel register offset: %#x value: %#x\n", chan_reg_offs[i], dw_read(dw_cfg->base, DW_CHAN_OFFSET(channel) + chan_reg_offs[i])); + } /* IP Register Dump */ for (i = DW_DMA_CHANNEL_REGISTER_OFFSET_START; i <= DW_DMA_CHANNEL_REGISTER_OFFSET_END; - i += 0x8) + i += 0x8) { LOG_INF(" ip register offset: %#x value: %#x\n", ip_reg_offs[i], dw_read(dw_cfg->base, ip_reg_offs[i])); + } } #endif diff --git a/drivers/dma/dma_iproc_pax_v1.c b/drivers/dma/dma_iproc_pax_v1.c index ba1450d6d8e..9acfeabd374 100644 --- a/drivers/dma/dma_iproc_pax_v1.c +++ b/drivers/dma/dma_iproc_pax_v1.c @@ -536,8 +536,9 @@ static int peek_ring_cmpl(const struct device *dev, do { wr_offs = sys_read32(RM_RING_REG(pd, idx, RING_CMPL_WRITE_PTR)); - if (PAX_DMA_GET_CMPL_COUNT(wr_offs, rd_offs) >= pl_len) + if (PAX_DMA_GET_CMPL_COUNT(wr_offs, rd_offs) >= pl_len) { break; + } k_busy_wait(1); } while (--timeout); diff --git a/drivers/dma/dma_iproc_pax_v2.c b/drivers/dma/dma_iproc_pax_v2.c index 4b7e7fafcd2..556af62ae75 100644 --- a/drivers/dma/dma_iproc_pax_v2.c +++ b/drivers/dma/dma_iproc_pax_v2.c @@ -623,8 +623,9 @@ static int peek_ring_cmpl(const struct device *dev, do { wr_offs = sys_read32(RM_RING_REG(pd, idx, RING_CMPL_WRITE_PTR)); - if (PAX_DMA_GET_CMPL_COUNT(wr_offs, rd_offs) >= pl_len) + if (PAX_DMA_GET_CMPL_COUNT(wr_offs, rd_offs) >= pl_len) { break; + } k_busy_wait(1); } while (--timeout); diff --git a/drivers/ethernet/phy/phy_mii.c b/drivers/ethernet/phy/phy_mii.c index 8a1436cde87..f4f06a0f10d 100644 --- a/drivers/ethernet/phy/phy_mii.c +++ b/drivers/ethernet/phy/phy_mii.c @@ -349,15 +349,17 @@ static int phy_mii_cfg_link(const struct device *dev, } if (data->gigabit_supported) { - if (adv_speeds & LINK_FULL_1000BASE_T) + if (adv_speeds & LINK_FULL_1000BASE_T) { c1kt_reg |= MII_ADVERTISE_1000_FULL; - else + } else { c1kt_reg &= ~MII_ADVERTISE_1000_FULL; + } - if (adv_speeds & LINK_HALF_1000BASE_T) + if (adv_speeds & LINK_HALF_1000BASE_T) { c1kt_reg |= MII_ADVERTISE_1000_HALF; - else + } else { c1kt_reg &= ~MII_ADVERTISE_1000_HALF; + } if (reg_write(dev, MII_1KTCR, c1kt_reg) < 0) { return -EIO; diff --git a/drivers/firmware/scmi/mailbox.c b/drivers/firmware/scmi/mailbox.c index 2c61afa9a87..2f18ce89cdc 100644 --- a/drivers/firmware/scmi/mailbox.c +++ b/drivers/firmware/scmi/mailbox.c @@ -16,8 +16,9 @@ static void scmi_mbox_cb(const struct device *mbox, { struct scmi_channel *scmi_chan = user_data; - if (scmi_chan->cb) + if (scmi_chan->cb) { scmi_chan->cb(scmi_chan); + } } static int scmi_mbox_send_message(const struct device *transport, diff --git a/drivers/flash/flash_cadence_qspi_nor_ll.c b/drivers/flash/flash_cadence_qspi_nor_ll.c index b41c7b7ce4a..8df04306cd4 100644 --- a/drivers/flash/flash_cadence_qspi_nor_ll.c +++ b/drivers/flash/flash_cadence_qspi_nor_ll.c @@ -307,8 +307,9 @@ int cad_qspi_n25q_wait_for_program_and_erase(struct cad_qspi_params *cad_params, LOG_ERR("Error getting device status\n"); return -1; } - if (!CAD_QSPI_STIG_SR_BUSY(status)) + if (!CAD_QSPI_STIG_SR_BUSY(status)) { break; + } count++; } @@ -328,12 +329,14 @@ int cad_qspi_n25q_wait_for_program_and_erase(struct cad_qspi_params *cad_params, } if ((program_only && CAD_QSPI_STIG_FLAGSR_PROGRAMREADY(flag_sr)) || - (!program_only && CAD_QSPI_STIG_FLAGSR_ERASEREADY(flag_sr))) + (!program_only && CAD_QSPI_STIG_FLAGSR_ERASEREADY(flag_sr))) { break; + } } - if (count >= CAD_QSPI_COMMAND_TIMEOUT) + if (count >= CAD_QSPI_COMMAND_TIMEOUT) { LOG_ERR("Timed out waiting for program and erase\n"); + } if ((program_only && CAD_QSPI_STIG_FLAGSR_PROGRAMERROR(flag_sr)) || (!program_only && CAD_QSPI_STIG_FLAGSR_ERASEERROR(flag_sr))) { @@ -546,10 +549,11 @@ void cad_qspi_calibration(struct cad_qspi_params *cad_params, uint32_t dev_clk, } if (rdid == sample_rdid) { - if (first_pass == -1) + if (first_pass == -1) { first_pass = data_cap_delay; - else + } else { last_pass = data_cap_delay; + } } data_cap_delay++; @@ -725,8 +729,9 @@ int cad_qspi_indirect_page_bound_write(struct cad_qspi_params *cad_params, uint3 space = MIN(write_capacity - write_fill_level, (len - write_count) / sizeof(uint32_t)); write_data = (uint32_t *)(buffer + write_count); - for (i = 0; i < space; ++i) + for (i = 0; i < space; ++i) { sys_write32(*write_data++, cad_params->data_base); + } write_count += space * sizeof(uint32_t); } @@ -756,8 +761,9 @@ int cad_qspi_read_bank(struct cad_qspi_params *cad_params, uint8_t *buffer, uint level = CAD_QSPI_SRAMFILL_INDRDPART( sys_read32(cad_params->reg_base + CAD_QSPI_SRAMFILL)); read_data = (uint32_t *)(buffer + read_count); - for (i = 0; i < level; ++i) + for (i = 0; i < level; ++i) { *read_data++ = sys_read32(cad_params->data_base); + } read_count += level * sizeof(uint32_t); count++; diff --git a/drivers/flash/flash_rpi_pico.c b/drivers/flash/flash_rpi_pico.c index 4b7dac92b09..71231c48043 100644 --- a/drivers/flash/flash_rpi_pico.c +++ b/drivers/flash/flash_rpi_pico.c @@ -68,8 +68,9 @@ static void __no_inline_not_in_flash_func(flash_init_boot2_copyout)(void) if (boot2_copyout_valid) { return; } - for (int i = 0; i < BOOT2_SIZE_WORDS; ++i) + for (int i = 0; i < BOOT2_SIZE_WORDS; ++i) { boot2_copyout[i] = ((uint32_t *)FLASH_BASE)[i]; + } __compiler_memory_barrier(); boot2_copyout_valid = true; } @@ -119,8 +120,9 @@ void __no_inline_not_in_flash_func(flash_put_get)(const uint8_t *tx, uint8_t *rx if (rx_skip) { --rx_skip; } else { - if (rx) + if (rx) { *rx++ = rxbyte; + } --rx_count; } } diff --git a/drivers/flash/flash_stm32l4x.c b/drivers/flash/flash_stm32l4x.c index f38a36f4b36..c0a9207b7a5 100644 --- a/drivers/flash/flash_stm32l4x.c +++ b/drivers/flash/flash_stm32l4x.c @@ -192,8 +192,9 @@ static int erase_page(const struct device *dev, unsigned int page) #ifdef FLASH_CR_BKER regs->CR &= ~FLASH_CR_BKER_Msk; /* Select bank, only for DUALBANK devices */ - if (page >= pages_per_bank) + if (page >= pages_per_bank) { regs->CR |= FLASH_CR_BKER; + } #endif regs->CR &= ~FLASH_CR_PNB_Msk; regs->CR |= ((page % pages_per_bank) << 3); diff --git a/drivers/fuel_gauge/sbs_gauge/emul_sbs_gauge.c b/drivers/fuel_gauge/sbs_gauge/emul_sbs_gauge.c index 160552edeff..b18aa35aa47 100644 --- a/drivers/fuel_gauge/sbs_gauge/emul_sbs_gauge.c +++ b/drivers/fuel_gauge/sbs_gauge/emul_sbs_gauge.c @@ -291,8 +291,9 @@ static int emul_sbs_fuel_gauge_set_battery_charging(const struct emul *target, u { struct sbs_gauge_emul_data *data = target->data; - if (uV == 0 || uA == 0) + if (uV == 0 || uA == 0) { return -EINVAL; + } data->batt_state.uA = uA; data->batt_state.uV = uV; diff --git a/drivers/gpio/gpio_ite_it8xxx2.c b/drivers/gpio/gpio_ite_it8xxx2.c index 1171c5b3391..7e441eb9c88 100644 --- a/drivers/gpio/gpio_ite_it8xxx2.c +++ b/drivers/gpio/gpio_ite_it8xxx2.c @@ -433,12 +433,13 @@ static int gpio_ite_configure(const struct device *dev, } /* Set input or output. */ - if (flags & GPIO_OUTPUT) + if (flags & GPIO_OUTPUT) { *reg_gpcr = (*reg_gpcr | GPCR_PORT_PIN_MODE_OUTPUT) & ~GPCR_PORT_PIN_MODE_INPUT; - else + } else { *reg_gpcr = (*reg_gpcr | GPCR_PORT_PIN_MODE_INPUT) & ~GPCR_PORT_PIN_MODE_OUTPUT; + } /* Handle pullup / pulldown */ if (flags & GPIO_PULL_UP) { @@ -475,8 +476,9 @@ static int gpio_ite_get_config(const struct device *dev, "Invalid GPIO group index"); /* push-pull or open-drain */ - if (*reg_gpotr & mask) + if (*reg_gpotr & mask) { flags |= GPIO_OPEN_DRAIN; + } /* 1.8V or 3.3V */ reg_1p8v = &IT8XXX2_GPIO_GCRX( diff --git a/drivers/gpio/gpio_rt1718s_port.c b/drivers/gpio/gpio_rt1718s_port.c index 2a57b63c2f3..d65e30ca880 100644 --- a/drivers/gpio/gpio_rt1718s_port.c +++ b/drivers/gpio/gpio_rt1718s_port.c @@ -331,10 +331,11 @@ void rt1718s_gpio_alert_handler(const struct device *dev) k_sem_give(&data_port->lock); - if (reg_int8 & RT1718S_GPIO_INT_MASK) + if (reg_int8 & RT1718S_GPIO_INT_MASK) { /* Call the GPIO callbacks for rising *or* falling edge */ gpio_fire_callbacks(&data_port->cb_list_gpio, config->gpio_port_dev, (reg_int8 & 0x7) | ((reg_int8 >> 4) & 0x7)); + } } static const struct gpio_driver_api gpio_rt1718s_driver = { diff --git a/drivers/hwspinlock/sqn_hwspinlock.c b/drivers/hwspinlock/sqn_hwspinlock.c index b6b80d91096..ecda78d876a 100644 --- a/drivers/hwspinlock/sqn_hwspinlock.c +++ b/drivers/hwspinlock/sqn_hwspinlock.c @@ -45,8 +45,9 @@ static int sqn_hwspinlock_trylock(const struct device *dev, uint32_t id) const struct sqn_hwspinlock_config *config = dev->config; uint8_t cpuid; - if (id > config->num_locks) + if (id > config->num_locks) { return -EINVAL; + } /* * If the register value is equal to cpuid, this means that the current diff --git a/drivers/power_domain/power_domain_intel_adsp.c b/drivers/power_domain/power_domain_intel_adsp.c index 50b4582507a..f9d78a142cf 100644 --- a/drivers/power_domain/power_domain_intel_adsp.c +++ b/drivers/power_domain/power_domain_intel_adsp.c @@ -43,8 +43,9 @@ static int pd_intel_adsp_set_power_enable(struct pg_bits *bits, bool power_enabl volatile uint32_t *key_read_ptr = &adsp_pending_buffer; uint32_t key_value = *key_read_ptr; - if (key_value != INTEL_ADSP_ACE15_MAGIC_KEY) + if (key_value != INTEL_ADSP_ACE15_MAGIC_KEY) { return -EINVAL; + } } #endif sys_write16(sys_read16((mem_addr_t)ACE_PWRCTL) & ~(SPA_bit_mask), diff --git a/drivers/ps2/ps2_npcx_controller.c b/drivers/ps2/ps2_npcx_controller.c index 991beb57072..e121ff5e368 100644 --- a/drivers/ps2/ps2_npcx_controller.c +++ b/drivers/ps2/ps2_npcx_controller.c @@ -361,8 +361,9 @@ static int ps2_npcx_ctrl_init(const struct device *dev) */ inst->PSIEN = BIT(NPCX_PSIEN_SOTIE) | BIT(NPCX_PSIEN_EOTIE) | BIT(NPCX_PSIEN_PS2_WUE); - if (config->clk_cfg.bus == NPCX_CLOCK_BUS_FREERUN) + if (config->clk_cfg.bus == NPCX_CLOCK_BUS_FREERUN) { inst->PSIEN |= BIT(NPCX_PSIEN_PS2_CLK_SEL); + } /* Enable weak internal pull-up */ inst->PSCON |= BIT(NPCX_PSCON_WPUED); /* Enable shift mechanism */ diff --git a/drivers/pwm/pwm_mchp_xec.c b/drivers/pwm/pwm_mchp_xec.c index 305944cf99b..bd326680d3d 100644 --- a/drivers/pwm/pwm_mchp_xec.c +++ b/drivers/pwm/pwm_mchp_xec.c @@ -327,8 +327,9 @@ static int pwm_xec_set_cycles(const struct device *dev, uint32_t channel, return -EIO; } - if (flags & PWM_POLARITY_INVERTED) + if (flags & PWM_POLARITY_INVERTED) { regs->CONFIG |= MCHP_PWM_CFG_ON_POL_LO; + } on = pulse_cycles; off = period_cycles - pulse_cycles; diff --git a/drivers/pwm/pwm_npcx.c b/drivers/pwm/pwm_npcx.c index 44dd89d3504..f4bdb039c69 100644 --- a/drivers/pwm/pwm_npcx.c +++ b/drivers/pwm/pwm_npcx.c @@ -70,10 +70,11 @@ static void pwm_npcx_configure(const struct device *dev, int clk_bus) NPCX_PWM_CLOCK_APB2_LFCLK); /* Select clock source to LFCLK by flag, otherwise APB clock source */ - if (clk_bus == NPCX_CLOCK_BUS_LFCLK) + if (clk_bus == NPCX_CLOCK_BUS_LFCLK) { inst->PWMCTL |= BIT(NPCX_PWMCTL_CKSEL); - else + } else { inst->PWMCTL &= ~BIT(NPCX_PWMCTL_CKSEL); + } } /* PWM api functions */ diff --git a/drivers/rtc/rtc_ambiq.c b/drivers/rtc/rtc_ambiq.c index 90caffb420b..9a761742428 100644 --- a/drivers/rtc/rtc_ambiq.c +++ b/drivers/rtc/rtc_ambiq.c @@ -68,10 +68,11 @@ static void rtc_time_to_ambiq_time_set(const struct rtc_time *tm, am_hal_rtc_tim static void ambiq_time_to_rtc_time_set(const am_hal_rtc_time_t *atm, struct rtc_time *tm) { tm->tm_year = atm->ui32Year; - if (atm->ui32CenturyBit == 0) + if (atm->ui32CenturyBit == 0) { tm->tm_year += 100; - else + } else { tm->tm_year += 200; + } tm->tm_wday = atm->ui32Weekday; tm->tm_mon = atm->ui32Month - 1; tm->tm_mday = atm->ui32DayOfMonth; diff --git a/drivers/sensor/adi/adxl367/adxl367.c b/drivers/sensor/adi/adxl367/adxl367.c index 7810c9d387c..1679dca10a7 100644 --- a/drivers/sensor/adi/adxl367/adxl367.c +++ b/drivers/sensor/adi/adxl367/adxl367.c @@ -352,8 +352,9 @@ int adxl367_self_test(const struct device *dev) x_axis_2 = ((int16_t)read_val[0] << 6) + (read_val[1] >> 2); /* extend sign to 16 bits */ - if ((x_axis_2 & BIT(13)) != 0) + if ((x_axis_2 & BIT(13)) != 0) { x_axis_2 |= GENMASK(15, 14); + } ret = adxl367_set_op_mode(dev, ADXL367_STANDBY); if (ret != 0) { diff --git a/drivers/sensor/adi/adxl367/adxl367_i2c.c b/drivers/sensor/adi/adxl367/adxl367_i2c.c index 762334ad8da..bd5c7fd4fc1 100644 --- a/drivers/sensor/adi/adxl367/adxl367_i2c.c +++ b/drivers/sensor/adi/adxl367/adxl367_i2c.c @@ -28,8 +28,9 @@ static int adxl367_bus_access(const struct device *dev, uint8_t reg, ADXL367_TO_REG(reg), (uint8_t *) data, length); } else { - if (length != 1) + if (length != 1) { return -EINVAL; + } return i2c_reg_write_byte_dt(&config->i2c, ADXL367_TO_REG(reg), diff --git a/drivers/sensor/bosch/bme280/bme280.c b/drivers/sensor/bosch/bme280/bme280.c index 95b6cdfe9c3..5e0c1580498 100644 --- a/drivers/sensor/bosch/bme280/bme280.c +++ b/drivers/sensor/bosch/bme280/bme280.c @@ -148,8 +148,9 @@ int bme280_sample_fetch_helper(const struct device *dev, enum pm_device_state state; (void)pm_device_state_get(dev, &state); /* Do not allow sample fetching from suspended state */ - if (state == PM_DEVICE_STATE_SUSPENDED) + if (state == PM_DEVICE_STATE_SUSPENDED) { return -EIO; + } #endif #ifdef CONFIG_BME280_MODE_FORCED diff --git a/drivers/sensor/silabs/si7210/si7210.c b/drivers/sensor/silabs/si7210/si7210.c index 68525ba695a..7aebbab785c 100644 --- a/drivers/sensor/silabs/si7210/si7210.c +++ b/drivers/sensor/silabs/si7210/si7210.c @@ -332,8 +332,9 @@ static int si7210_sample_fetch(const struct device *dev, enum sensor_channel cha enum pm_device_state state; (void)pm_device_state_get(dev, &state); /* Do not allow sample fetching from suspended state */ - if (state == PM_DEVICE_STATE_SUSPENDED) + if (state == PM_DEVICE_STATE_SUSPENDED) { return -EIO; + } #endif /* Prevent going into suspend in the middle of the conversion */ diff --git a/drivers/sensor/st/iis2iclx/iis2iclx_trigger.c b/drivers/sensor/st/iis2iclx/iis2iclx_trigger.c index 174583c75e7..6149a8bdd5d 100644 --- a/drivers/sensor/st/iis2iclx/iis2iclx_trigger.c +++ b/drivers/sensor/st/iis2iclx/iis2iclx_trigger.c @@ -36,8 +36,9 @@ static int iis2iclx_enable_t_int(const struct device *dev, int enable) } /* set interrupt (TEMP DRDY interrupt is only on INT2) */ - if (cfg->int_pin == 1) + if (cfg->int_pin == 1) { return -EIO; + } iis2iclx_read_reg((stmdev_ctx_t *)&cfg->ctx, IIS2ICLX_INT2_CTRL, (uint8_t *)&int2_route.int2_ctrl, 1); diff --git a/drivers/sensor/st/ism330dhcx/ism330dhcx_trigger.c b/drivers/sensor/st/ism330dhcx/ism330dhcx_trigger.c index ac4c16b9506..e5b92eeef07 100644 --- a/drivers/sensor/st/ism330dhcx/ism330dhcx_trigger.c +++ b/drivers/sensor/st/ism330dhcx/ism330dhcx_trigger.c @@ -37,8 +37,9 @@ static int ism330dhcx_enable_t_int(const struct device *dev, int enable) } /* set interrupt (TEMP DRDY interrupt is only on INT2) */ - if (cfg->int_pin == 1) + if (cfg->int_pin == 1) { return -EIO; + } ism330dhcx_read_reg(ism330dhcx->ctx, ISM330DHCX_INT2_CTRL, (uint8_t *)&int2_route.int2_ctrl, 1); diff --git a/drivers/sensor/st/lsm6dso/lsm6dso_trigger.c b/drivers/sensor/st/lsm6dso/lsm6dso_trigger.c index 8f8bc527282..7c7a3c13f93 100644 --- a/drivers/sensor/st/lsm6dso/lsm6dso_trigger.c +++ b/drivers/sensor/st/lsm6dso/lsm6dso_trigger.c @@ -37,8 +37,9 @@ static int lsm6dso_enable_t_int(const struct device *dev, int enable) } /* set interrupt (TEMP DRDY interrupt is only on INT2) */ - if (cfg->int_pin == 1) + if (cfg->int_pin == 1) { return -EIO; + } lsm6dso_read_reg(ctx, LSM6DSO_INT2_CTRL, (uint8_t *)&int2_ctrl, 1); int2_ctrl.int2_drdy_temp = enable; diff --git a/drivers/sensor/vishay/vcnl4040/vcnl4040.c b/drivers/sensor/vishay/vcnl4040/vcnl4040.c index e7472af5700..ffc39ca32bb 100644 --- a/drivers/sensor/vishay/vcnl4040/vcnl4040.c +++ b/drivers/sensor/vishay/vcnl4040/vcnl4040.c @@ -189,14 +189,16 @@ static int vcnl4040_pm_action(const struct device *dev, uint16_t ps_conf; ret = vcnl4040_read(dev, VCNL4040_REG_PS_CONF, &ps_conf); - if (ret < 0) + if (ret < 0) { return ret; + } #ifdef CONFIG_VCNL4040_ENABLE_ALS uint16_t als_conf; ret = vcnl4040_read(dev, VCNL4040_REG_ALS_CONF, &als_conf); - if (ret < 0) + if (ret < 0) { return ret; + } #endif switch (action) { case PM_DEVICE_ACTION_RESUME: @@ -205,16 +207,18 @@ static int vcnl4040_pm_action(const struct device *dev, ret = vcnl4040_write(dev, VCNL4040_REG_PS_CONF, ps_conf); - if (ret < 0) + if (ret < 0) { return ret; + } #ifdef CONFIG_VCNL4040_ENABLE_ALS /* Clear als shutdown */ als_conf &= ~VCNL4040_ALS_SD_MASK; ret = vcnl4040_write(dev, VCNL4040_REG_ALS_CONF, als_conf); - if (ret < 0) + if (ret < 0) { return ret; + } #endif break; case PM_DEVICE_ACTION_SUSPEND: @@ -223,16 +227,18 @@ static int vcnl4040_pm_action(const struct device *dev, ret = vcnl4040_write(dev, VCNL4040_REG_PS_CONF, ps_conf); - if (ret < 0) + if (ret < 0) { return ret; + } #ifdef CONFIG_VCNL4040_ENABLE_ALS /* Clear als shutdown bit 0 */ als_conf |= VCNL4040_ALS_SD_MASK; ret = vcnl4040_write(dev, VCNL4040_REG_ALS_CONF, als_conf); - if (ret < 0) + if (ret < 0) { return ret; + } #endif break; default: diff --git a/drivers/serial/uart_pl011.c b/drivers/serial/uart_pl011.c index 02238e84ac2..2f25c305627 100644 --- a/drivers/serial/uart_pl011.c +++ b/drivers/serial/uart_pl011.c @@ -378,8 +378,9 @@ static int pl011_irq_tx_ready(const struct device *dev) { struct pl011_data *data = dev->data; - if (!data->sbsa && !(get_uart(dev)->cr & PL011_CR_TXE)) + if (!data->sbsa && !(get_uart(dev)->cr & PL011_CR_TXE)) { return false; + } return ((get_uart(dev)->imsc & PL011_IMSC_TXIM) && /* Check for TX interrupt status is set or TX FIFO is empty. */ @@ -400,8 +401,9 @@ static int pl011_irq_rx_ready(const struct device *dev) { struct pl011_data *data = dev->data; - if (!data->sbsa && !(get_uart(dev)->cr & PL011_CR_RXE)) + if (!data->sbsa && !(get_uart(dev)->cr & PL011_CR_RXE)) { return false; + } return ((get_uart(dev)->imsc & PL011_IMSC_RXIM) && (!(get_uart(dev)->fr & PL011_FR_RXFE))); diff --git a/drivers/serial/uart_sifive.c b/drivers/serial/uart_sifive.c index 42a40ecfcfa..f0fa3d501ff 100644 --- a/drivers/serial/uart_sifive.c +++ b/drivers/serial/uart_sifive.c @@ -132,8 +132,9 @@ static int uart_sifive_fifo_fill(const struct device *dev, volatile struct uart_sifive_regs_t *uart = DEV_UART(dev); int i; - for (i = 0; i < size && !(uart->tx & TXDATA_FULL); i++) + for (i = 0; i < size && !(uart->tx & TXDATA_FULL); i++) { uart->tx = (int)tx_data[i]; + } return i; } @@ -158,8 +159,9 @@ static int uart_sifive_fifo_read(const struct device *dev, for (i = 0; i < size; i++) { val = uart->rx; - if (val & RXDATA_EMPTY) + if (val & RXDATA_EMPTY) { break; + } rx_data[i] = (uint8_t)(val & RXDATA_MASK); } @@ -311,8 +313,9 @@ static void uart_sifive_irq_handler(const struct device *dev) { struct uart_sifive_data *data = dev->data; - if (data->callback) + if (data->callback) { data->callback(dev, data->cb_data); + } } #endif /* CONFIG_UART_INTERRUPT_DRIVEN */ diff --git a/drivers/spi/spi_pl022.c b/drivers/spi/spi_pl022.c index bc4392d807f..0b4f30f2db1 100644 --- a/drivers/spi/spi_pl022.c +++ b/drivers/spi/spi_pl022.c @@ -695,11 +695,13 @@ static void spi_pl022_start_async_xfer(const struct device *dev) struct spi_pl022_data *data = dev->data; /* Ensure writable */ - while (!SSP_TX_FIFO_EMPTY(cfg->reg)) + while (!SSP_TX_FIFO_EMPTY(cfg->reg)) { ; + } /* Drain RX FIFO */ - while (SSP_RX_FIFO_NOT_EMPTY(cfg->reg)) + while (SSP_RX_FIFO_NOT_EMPTY(cfg->reg)) { SSP_READ_REG(SSP_DR(cfg->reg)); + } data->tx_count = 0; data->rx_count = 0; @@ -746,8 +748,9 @@ static void spi_pl022_xfer(const struct device *dev) ; } /* Drain RX FIFO */ - while (SSP_RX_FIFO_NOT_EMPTY(cfg->reg)) + while (SSP_RX_FIFO_NOT_EMPTY(cfg->reg)) { SSP_READ_REG(SSP_DR(cfg->reg)); + } while (data->rx_count < chunk_len || data->tx_count < chunk_len) { /* Fill up fifo with available TX data */ diff --git a/drivers/tee/optee/optee.c b/drivers/tee/optee/optee.c index 568d7deade7..1b1a3fb8d92 100644 --- a/drivers/tee/optee/optee.c +++ b/drivers/tee/optee/optee.c @@ -473,8 +473,9 @@ static int optee_notif_wait(const struct device *dev, uint32_t key) k_spinlock_key_t sp_key; int prev_val; - if (key > CONFIG_OPTEE_MAX_NOTIF) + if (key > CONFIG_OPTEE_MAX_NOTIF) { return -EINVAL; + } entry = k_malloc(sizeof(*entry)); if (!entry) { diff --git a/drivers/timer/ite_it8xxx2_timer.c b/drivers/timer/ite_it8xxx2_timer.c index 86866bf08f6..3d2426a748d 100644 --- a/drivers/timer/ite_it8xxx2_timer.c +++ b/drivers/timer/ite_it8xxx2_timer.c @@ -381,10 +381,11 @@ static int timer_init(enum ext_timer_idx ext_timer, /* Disable external timer x */ IT8XXX2_EXT_CTRLX(ext_timer) &= ~IT8XXX2_EXT_ETXEN; - if (start == EXT_START_TIMER) + if (start == EXT_START_TIMER) { /* Enable and re-start external timer x */ IT8XXX2_EXT_CTRLX(ext_timer) |= (IT8XXX2_EXT_ETXEN | IT8XXX2_EXT_ETXRST); + } if (with_int == EXT_WITH_TIMER_INT) { irq_enable(irq_num); diff --git a/drivers/timer/npcx_itim_timer.c b/drivers/timer/npcx_itim_timer.c index fba2bc2b3c1..eb0436c8a6e 100644 --- a/drivers/timer/npcx_itim_timer.c +++ b/drivers/timer/npcx_itim_timer.c @@ -223,8 +223,9 @@ static inline uint32_t npcx_itim_get_evt_cyc32(void) * Wait for two consecutive equal values are read since the source clock * of event timer is 32KHz. */ - while ((cnt2 = evt_tmr->ITCNT32) != cnt1) + while ((cnt2 = evt_tmr->ITCNT32) != cnt1) { cnt1 = cnt2; + } /* Return current value of 32-bit counter of event timer */ return cnt2; diff --git a/drivers/watchdog/wdt_dw.h b/drivers/watchdog/wdt_dw.h index d3af812d817..c28ac8d3550 100644 --- a/drivers/watchdog/wdt_dw.h +++ b/drivers/watchdog/wdt_dw.h @@ -326,10 +326,11 @@ static inline void dw_wdt_response_mode_set(const uint32_t base, const bool mode { uint32_t control = sys_read32(base + WDT_CR); - if (mode) + if (mode) { control |= WDT_CR_RMOD; - else + } else { control &= ~WDT_CR_RMOD; + } sys_write32(control, base + WDT_CR); } diff --git a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c index 29fadd94030..26d9249248c 100644 --- a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c +++ b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c @@ -204,10 +204,11 @@ static inline int qspi_get_mode(bool cpol, bool cpha) { register int ret = -EINVAL; - if ((!cpol) && (!cpha)) + if ((!cpol) && (!cpha)) { ret = 0; - else if (cpol && cpha) + } else if (cpol && cpha) { ret = 1; + } __ASSERT(ret != -EINVAL, "Invalid QSPI mode"); @@ -458,15 +459,17 @@ static inline void qspi_complete(struct qspi_nor_data *dev_data) static inline void _qspi_complete(struct qspi_nor_data *dev_data) { - if (!qspi_cfg->easydma) + if (!qspi_cfg->easydma) { return; + } qspi_complete(dev_data); } static inline void _qspi_wait_for_completion(const struct device *dev, nrfx_err_t res) { - if (!qspi_cfg->easydma) + if (!qspi_cfg->easydma) { return; + } qspi_wait_for_completion(dev, res); } @@ -482,8 +485,9 @@ static void qspi_handler(nrfx_qspi_evt_t event, void *p_context) { struct qspi_nor_data *dev_data = p_context; - if (event == NRFX_QSPI_EVENT_DONE) + if (event == NRFX_QSPI_EVENT_DONE) { _qspi_complete(dev_data); + } } static bool qspi_initialized; @@ -540,10 +544,11 @@ static void qspi_device_uninit(const struct device *dev) if (last) { while (nrfx_qspi_mem_busy_check() != NRFX_SUCCESS) { - if (IS_ENABLED(CONFIG_MULTITHREADING)) + if (IS_ENABLED(CONFIG_MULTITHREADING)) { k_msleep(50); - else + } else { k_busy_wait(50000); + } } nrfx_qspi_uninit(); @@ -567,8 +572,9 @@ static void qspi_device_uninit(const struct device *dev) static int qspi_send_cmd(const struct device *dev, const struct qspi_cmd *cmd, bool wren) { /* Check input parameters */ - if (!cmd) + if (!cmd) { return -EINVAL; + } const void *tx_buf = NULL; size_t tx_len = 0; @@ -587,13 +593,15 @@ static int qspi_send_cmd(const struct device *dev, const struct qspi_cmd *cmd, b } if ((rx_len != 0) && (tx_len != 0)) { - if (rx_len != tx_len) + if (rx_len != tx_len) { return -EINVAL; + } xfer_len += tx_len; - } else + } else { /* At least one of these is zero. */ xfer_len += tx_len + rx_len; + } if (xfer_len > NRF_QSPI_CINSTR_LEN_9B) { LOG_WRN("cinstr %02x transfer too long: %zu", cmd->op_code, xfer_len); @@ -705,8 +713,9 @@ static inline void qspi_fill_init_struct(nrfx_qspi_config_t *initstruct) /* Configures QSPI memory for the transfer */ static int qspi_nrfx_configure(const struct device *dev) { - if (!dev) + if (!dev) { return -ENXIO; + } struct qspi_nor_data *dev_data = dev->data; @@ -775,12 +784,14 @@ static int qspi_nrfx_configure(const struct device *dev) * commands sent while it's happening can be * corrupted. Wait. */ - if (ret == 0) + if (ret == 0) { ret = qspi_wait_while_writing(dev); + } } - if (ret < 0) + if (ret < 0) { LOG_ERR("QE %s failed: %d", qe_value ? "set" : "clear", ret); + } } return ret; @@ -794,13 +805,15 @@ static inline nrfx_err_t read_non_aligned(const struct device *dev, int addr, vo int flash_prefix = (WORD_SIZE - (addr % WORD_SIZE)) % WORD_SIZE; - if (flash_prefix > size) + if (flash_prefix > size) { flash_prefix = size; + } int dest_prefix = (WORD_SIZE - (int)dptr % WORD_SIZE) % WORD_SIZE; - if (dest_prefix > size) + if (dest_prefix > size) { dest_prefix = size; + } int flash_suffix = (size - flash_prefix) % WORD_SIZE; int flash_middle = size - flash_prefix - flash_suffix; @@ -819,12 +832,14 @@ static inline nrfx_err_t read_non_aligned(const struct device *dev, int addr, vo _qspi_wait_for_completion(dev, res); - if (res != NRFX_SUCCESS) + if (res != NRFX_SUCCESS) { return res; + } /* perform shift in RAM */ - if (flash_prefix != dest_prefix) + if (flash_prefix != dest_prefix) { memmove(dptr + flash_prefix, dptr + dest_prefix, flash_middle); + } } /* read prefix */ @@ -833,8 +848,9 @@ static inline nrfx_err_t read_non_aligned(const struct device *dev, int addr, vo _qspi_wait_for_completion(dev, res); - if (res != NRFX_SUCCESS) + if (res != NRFX_SUCCESS) { return res; + } memcpy(dptr, buf + WORD_SIZE - flash_prefix, flash_prefix); } @@ -845,8 +861,9 @@ static inline nrfx_err_t read_non_aligned(const struct device *dev, int addr, vo _qspi_wait_for_completion(dev, res); - if (res != NRFX_SUCCESS) + if (res != NRFX_SUCCESS) { return res; + } memcpy(dptr + flash_prefix + flash_middle, buf, flash_suffix); } @@ -856,17 +873,20 @@ static inline nrfx_err_t read_non_aligned(const struct device *dev, int addr, vo static int qspi_nor_read(const struct device *dev, int addr, void *dest, size_t size) { - if (!dest) + if (!dest) { return -EINVAL; + } /* read size must be non-zero */ - if (!size) + if (!size) { return 0; + } int rc = qspi_device_init(dev); - if (rc != 0) + if (rc != 0) { goto out; + } qspi_lock(dev); @@ -905,31 +925,35 @@ static inline nrfx_err_t write_sub_word(const struct device *dev, int addr, cons static int qspi_nor_write(const struct device *dev, int addr, const void *src, size_t size) { - if (!src) + if (!src) { return -EINVAL; + } /* write size must be non-zero, less than 4, or a multiple of 4 */ - if ((size == 0) || ((size > 4) && ((size % 4U) != 0))) + if ((size == 0) || ((size > 4) && ((size % 4U) != 0))) { return -EINVAL; + } /* address must be 4-byte aligned */ - if ((addr % 4U) != 0) + if ((addr % 4U) != 0) { return -EINVAL; + } nrfx_err_t res = NRFX_SUCCESS; int rc = qspi_device_init(dev); - if (rc != 0) + if (rc != 0) { goto out; + } qspi_trans_lock(dev); qspi_lock(dev); - if (size < 4U) + if (size < 4U) { res = write_sub_word(dev, addr, src, size); - else { + } else { res = _nrfx_qspi_write(src, size, addr); _qspi_wait_for_completion(dev, res); } @@ -955,8 +979,9 @@ static int qspi_nor_configure(const struct device *dev) { int ret = qspi_nrfx_configure(dev); - if (ret != 0) + if (ret != 0) { return ret; + } qspi_device_uninit(dev); @@ -1001,13 +1026,15 @@ static int qspi_cmd_encryption(const struct device *dev, nrf_qspi_encryption_t * int ret = qspi_device_init(dev); - if (ret == 0) + if (ret == 0) { ret = qspi_send_cmd(dev, &cmd, false); + } qspi_device_uninit(dev); - if (ret < 0) + if (ret < 0) { LOG_DBG("cmd_encryption failed %d", ret); + } return ret; } @@ -1035,8 +1062,9 @@ int qspi_RDSR2(const struct device *dev, uint8_t *rdsr2) LOG_DBG("RDSR2 = 0x%x", sr); - if (ret == 0) + if (ret == 0) { *rdsr2 = sr; + } return ret; } @@ -1080,8 +1108,9 @@ int qspi_RDSR1(const struct device *dev, uint8_t *rdsr1) LOG_DBG("RDSR1 = 0x%x", sr); - if (ret == 0) + if (ret == 0) { *rdsr1 = sr; + } return ret; } @@ -1127,13 +1156,15 @@ int qspi_WRSR2(const struct device *dev, uint8_t data) }; int ret = qspi_device_init(dev); - if (ret == 0) + if (ret == 0) { ret = qspi_send_cmd(dev, &cmd, false); + } qspi_device_uninit(dev); - if (ret < 0) + if (ret < 0) { LOG_ERR("cmd_wakeup RPU failed %d", ret); + } return ret; } @@ -1183,13 +1214,15 @@ void qspi_update_nonce(unsigned int addr, int len, int hlread) NRF_QSPI_Type *p_reg = NRF_QSPI; - if (!qspi_cfg->encryption) + if (!qspi_cfg->encryption) { return; + } - if (nonce_last_addr == 0 || hlread) + if (nonce_last_addr == 0 || hlread) { p_reg->DMA_ENC.NONCE2 = ++nonce_cnt; - else if ((nonce_last_addr + 4) != addr) + } else if ((nonce_last_addr + 4) != addr) { p_reg->DMA_ENC.NONCE2 = ++nonce_cnt; + } nonce_last_addr = addr + len - 4; @@ -1326,8 +1359,9 @@ int qspi_enable_encryption(uint8_t *key) #if defined(CONFIG_SOC_SERIES_NRF53X) int err = 0; - if (qspi_cfg->encryption) + if (qspi_cfg->encryption) { return -EALREADY; + } int ret = qspi_device_init(&qspi_perip); diff --git a/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c b/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c index 4ab65805e8e..b8b45d7f811 100644 --- a/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c +++ b/drivers/wifi/nrfwifi/src/qspi/src/rpu_hw_if.c @@ -282,10 +282,11 @@ int rpu_read(unsigned int addr, void *data, int len) return -1; } - if (hl_flag) + if (hl_flag) { return qdev->hl_read(addr, data, len); - else + } else { return qdev->read(addr, data, len); + } } int rpu_write(unsigned int addr, const void *data, int len) diff --git a/drivers/wifi/nrfwifi/src/qspi/src/spi_if.c b/drivers/wifi/nrfwifi/src/qspi/src/spi_if.c index 03ffa4657b9..2cdf3662fd5 100644 --- a/drivers/wifi/nrfwifi/src/qspi/src/spi_if.c +++ b/drivers/wifi/nrfwifi/src/qspi/src/spi_if.c @@ -103,8 +103,9 @@ int spim_read_reg(uint32_t reg_addr, uint8_t *reg_value) LOG_DBG("err: %d -> %x %x %x %x %x %x", err, sr[0], sr[1], sr[2], sr[3], sr[4], sr[5]); - if (err == 0) + if (err == 0) { *reg_value = sr[1]; + } return err; } diff --git a/drivers/wifi/nrfwifi/src/shim.c b/drivers/wifi/nrfwifi/src/shim.c index 4db264f9c96..1c62d229055 100644 --- a/drivers/wifi/nrfwifi/src/shim.c +++ b/drivers/wifi/nrfwifi/src/shim.c @@ -213,8 +213,9 @@ static void *zep_shim_nbuf_alloc(unsigned int size) nbuff = (struct nwb *)k_calloc(sizeof(struct nwb), sizeof(char)); - if (!nbuff) + if (!nbuff) { return NULL; + } nbuff->priv = k_calloc(size, sizeof(char)); @@ -811,8 +812,9 @@ static void *zep_shim_timer_alloc(void) timer = k_malloc(sizeof(*timer)); - if (!timer) + if (!timer) { LOG_ERR("%s: Unable to allocate memory for work", __func__); + } return timer; } diff --git a/drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c b/drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c index 66cd72e4f58..c5c6f18804e 100644 --- a/drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c +++ b/drivers/wifi/nrfwifi/src/wifi_mgmt_scan.c @@ -262,12 +262,15 @@ out: static inline enum wifi_mfp_options drv_to_wifi_mgmt_mfp(unsigned char mfp_flag) { - if (!mfp_flag) + if (!mfp_flag) { return WIFI_MFP_DISABLE; - if (mfp_flag & NRF_WIFI_MFP_REQUIRED) + } + if (mfp_flag & NRF_WIFI_MFP_REQUIRED) { return WIFI_MFP_REQUIRED; - if (mfp_flag & NRF_WIFI_MFP_CAPABLE) + } + if (mfp_flag & NRF_WIFI_MFP_CAPABLE) { return WIFI_MFP_OPTIONAL; + } return WIFI_MFP_UNKNOWN; } diff --git a/drivers/wifi/nrfwifi/src/wifi_util.c b/drivers/wifi/nrfwifi/src/wifi_util.c index aec552754ab..43c527a4b7d 100644 --- a/drivers/wifi/nrfwifi/src/wifi_util.c +++ b/drivers/wifi/nrfwifi/src/wifi_util.c @@ -993,8 +993,9 @@ SHELL_CMD_REGISTER(wifi_util, static int nrf_wifi_util_init(void) { - if (nrf_wifi_util_conf_init(&ctx->conf_params) < 0) + if (nrf_wifi_util_conf_init(&ctx->conf_params) < 0) { return -1; + } return 0; } diff --git a/drivers/wifi/nrfwifi/src/work.c b/drivers/wifi/nrfwifi/src/work.c index dbc716a6eeb..371e4760948 100644 --- a/drivers/wifi/nrfwifi/src/work.c +++ b/drivers/wifi/nrfwifi/src/work.c @@ -41,8 +41,9 @@ int get_free_work_item_index(void) int i; for (i = 0; i < CONFIG_NRF70_WORKQ_MAX_ITEMS; i++) { - if (zep_work_item[i].in_use) + if (zep_work_item[i].in_use) { continue; + } return i; } @@ -130,17 +131,20 @@ void work_init(struct zep_work_item *item, void (*callback)(unsigned long), void work_schedule(struct zep_work_item *item) { - if (item->type == ZEP_WORK_TYPE_IRQ) + if (item->type == ZEP_WORK_TYPE_IRQ) { k_work_submit_to_queue(&zep_wifi_intr_q, &item->work); - else if (item->type == ZEP_WORK_TYPE_BH) + } else if (item->type == ZEP_WORK_TYPE_BH) { k_work_submit_to_queue(&zep_wifi_bh_q, &item->work); + } #ifdef CONFIG_NRF70_TX_DONE_WQ_ENABLED - else if (item->type == ZEP_WORK_TYPE_TX_DONE) + else if (item->type == ZEP_WORK_TYPE_TX_DONE) { k_work_submit_to_queue(&zep_wifi_tx_done_q, &item->work); + } #endif /* CONFIG_NRF70_TX_DONE_WQ_ENABLED */ #ifdef CONFIG_NRF70_RX_WQ_ENABLED - else if (item->type == ZEP_WORK_TYPE_RX) + else if (item->type == ZEP_WORK_TYPE_RX) { k_work_submit_to_queue(&zep_wifi_rx_q, &item->work); + } #endif /* CONFIG_NRF70_RX_WQ_ENABLED */ } diff --git a/drivers/wifi/nrfwifi/src/wpa_supp_if.c b/drivers/wifi/nrfwifi/src/wpa_supp_if.c index 6abddfb9bea..b022c8d5af1 100644 --- a/drivers/wifi/nrfwifi/src/wpa_supp_if.c +++ b/drivers/wifi/nrfwifi/src/wpa_supp_if.c @@ -514,8 +514,9 @@ int nrf_wifi_wpa_supp_scan2(void *if_priv, struct wpa_driver_scan_params *params } if (params->freqs) { - for (indx = 0; params->freqs[indx]; indx++) + for (indx = 0; params->freqs[indx]; indx++) { num_freqs++; + } } scan_info = k_calloc(sizeof(*scan_info) + (num_freqs * sizeof(unsigned int)), @@ -577,8 +578,9 @@ int nrf_wifi_wpa_supp_scan2(void *if_priv, struct wpa_driver_scan_params *params ret = 0; out: - if (scan_info) + if (scan_info) { k_free(scan_info); + } k_mutex_unlock(&vif_ctx_zep->vif_lock); return ret; } @@ -1362,7 +1364,7 @@ void nrf_wifi_wpa_supp_event_proc_unprot_mgmt(void *if_priv, if (cmd_evnt == NRF_WIFI_UMAC_EVENT_UNPROT_DEAUTHENTICATE) { event.unprot_deauth.reason_code = le_to_host16(mgmt->u.deauth.reason_code); - if (vif_ctx_zep->supp_drv_if_ctx && vif_ctx_zep->supp_callbk_fns.unprot_deauth) { + if (vif_ctx_zep->supp_drv_if_ctx && vif_ctx_zep->supp_callbk_fns.unprot_deauth) { vif_ctx_zep->supp_callbk_fns.unprot_deauth(vif_ctx_zep->supp_drv_if_ctx, &event); } @@ -1415,20 +1417,25 @@ int nrf_wifi_nl80211_send_mlme(void *if_priv, const u8 *data, goto out; } - if (offchanok) + if (offchanok) { mgmt_tx_info->nrf_wifi_flags |= NRF_WIFI_CMD_FRAME_OFFCHANNEL_TX_OK; + } - if (noack) + if (noack) { mgmt_tx_info->nrf_wifi_flags |= NRF_WIFI_CMD_FRAME_DONT_WAIT_FOR_ACK; + } - if (no_cck) + if (no_cck) { mgmt_tx_info->nrf_wifi_flags |= NRF_WIFI_CMD_FRAME_TX_NO_CCK_RATE; + } - if (freq) + if (freq) { mgmt_tx_info->frequency = freq; + } - if (wait_time) + if (wait_time) { mgmt_tx_info->dur = wait_time; + } if (data_len) { memcpy(mgmt_tx_info->frame.frame, data, data_len); @@ -1479,8 +1486,9 @@ int nrf_wifi_nl80211_send_mlme(void *if_priv, const u8 *data, } out: - if (mgmt_tx_info) + if (mgmt_tx_info) { k_free(mgmt_tx_info); + } k_mutex_unlock(&mgmt_tx_lock); k_mutex_unlock(&vif_ctx_zep->vif_lock); return status;