diff --git a/drivers/i2c/i2c_dw.c b/drivers/i2c/i2c_dw.c index 4297f1490cc..2b54061cc08 100644 --- a/drivers/i2c/i2c_dw.c +++ b/drivers/i2c/i2c_dw.c @@ -615,9 +615,9 @@ static int i2c_dw_runtime_configure(struct device *dev, uint32_t config) * must have register values larger than IC_FS_SPKLEN + 7 */ if (I2C_STD_LCNT <= (regs->ic_fs_spklen + 7)) { - value = regs->ic_fs_spklen + 8; + value = regs->ic_fs_spklen + 8; } else { - value = I2C_STD_LCNT; + value = I2C_STD_LCNT; } dw->lcnt = value; @@ -626,9 +626,9 @@ static int i2c_dw_runtime_configure(struct device *dev, uint32_t config) * must have register values larger than IC_FS_SPKLEN + 5 */ if (I2C_STD_HCNT <= (regs->ic_fs_spklen + 5)) { - value = regs->ic_fs_spklen + 6; + value = regs->ic_fs_spklen + 6; } else { - value = I2C_STD_HCNT; + value = I2C_STD_HCNT; } dw->hcnt = value; @@ -641,9 +641,9 @@ static int i2c_dw_runtime_configure(struct device *dev, uint32_t config) * must have register values larger than IC_FS_SPKLEN + 7 */ if (I2C_FS_LCNT <= (regs->ic_fs_spklen + 7)) { - value = regs->ic_fs_spklen + 8; + value = regs->ic_fs_spklen + 8; } else { - value = I2C_FS_LCNT; + value = I2C_FS_LCNT; } dw->lcnt = value; @@ -653,9 +653,9 @@ static int i2c_dw_runtime_configure(struct device *dev, uint32_t config) * must have register values larger than IC_FS_SPKLEN + 5 */ if (I2C_FS_HCNT <= (regs->ic_fs_spklen + 5)) { - value = regs->ic_fs_spklen + 6; + value = regs->ic_fs_spklen + 6; } else { - value = I2C_FS_HCNT; + value = I2C_FS_HCNT; } dw->hcnt = value; @@ -663,17 +663,17 @@ static int i2c_dw_runtime_configure(struct device *dev, uint32_t config) case I2C_SPEED_HIGH: if (dw->support_hs_mode) { if (I2C_HS_LCNT <= (regs->ic_hs_spklen + 7)) { - value = regs->ic_hs_spklen + 8; + value = regs->ic_hs_spklen + 8; } else { - value = I2C_HS_LCNT; + value = I2C_HS_LCNT; } dw->lcnt = value; if (I2C_HS_HCNT <= (regs->ic_hs_spklen + 5)) { - value = regs->ic_hs_spklen + 6; + value = regs->ic_hs_spklen + 6; } else { - value = I2C_HS_HCNT; + value = I2C_HS_HCNT; } dw->hcnt = value; diff --git a/kernel/microkernel/k_fifo.c b/kernel/microkernel/k_fifo.c index 413aeeda8fe..031a9610438 100644 --- a/kernel/microkernel/k_fifo.c +++ b/kernel/microkernel/k_fifo.c @@ -127,9 +127,9 @@ void _k_fifo_enque_request(struct k_args *A) #endif } else { if (likely(A->Time.ticks != TICKS_NONE)) { - A->Ctxt.task = _k_current_task; - A->priority = _k_current_task->priority; - _k_state_bit_set(_k_current_task, TF_ENQU); + A->Ctxt.task = _k_current_task; + A->priority = _k_current_task->priority; + _k_state_bit_set(_k_current_task, TF_ENQU); INSERT_ELM(Q->waiters, A); #ifdef CONFIG_SYS_CLOCK_EXISTS if (A->Time.ticks == TICKS_UNLIMITED)