diff --git a/drivers/aip31068/aip31068.c b/drivers/aip31068/aip31068.c index 40115244ad..a31e63c75e 100644 --- a/drivers/aip31068/aip31068.c +++ b/drivers/aip31068/aip31068.c @@ -398,9 +398,7 @@ static int _device_write(aip31068_t* dev, uint8_t *data, uint8_t len) { i2c_t i2c_dev = dev->params.i2c_dev; - if (i2c_acquire(i2c_dev) != 0) { - return -1; - } + i2c_acquire(i2c_dev); int rc = i2c_write_bytes(i2c_dev, dev->params.i2c_addr, data, len, 0); diff --git a/drivers/apds99xx/apds99xx.c b/drivers/apds99xx/apds99xx.c index e06f965fcc..16a5912fae 100644 --- a/drivers/apds99xx/apds99xx.c +++ b/drivers/apds99xx/apds99xx.c @@ -466,10 +466,7 @@ static int _reg_read(const apds99xx_t *dev, uint8_t reg, uint8_t *data, uint16_t assert(data != NULL); assert(len != 0); - if (i2c_acquire(dev->params.dev)) { - DEBUG_DEV("could not acquire I2C bus", dev); - return -APDS99XX_ERROR_I2C; - } + i2c_acquire(dev->params.dev); int res = i2c_read_regs(dev->params.dev, APDS99XX_I2C_ADDRESS, reg, data, len, 0); i2c_release(dev->params.dev); @@ -499,16 +496,15 @@ static int _reg_write(const apds99xx_t *dev, uint8_t reg, uint8_t *data, uint16_ if (IS_ACTIVE(ENABLE_DEBUG)) { printf("[apds99xx] %s i2c dev=%d addr=%02x: write to reg 0x%02x: ", __func__, dev->params.dev, APDS99XX_I2C_ADDRESS, reg); - for (uint16_t i = 0; i < len; i++) { - printf("%02x ", data[i]); + if (data && len) { + for (uint16_t i = 0; i < len; i++) { + printf("%02x ", data[i]); + } } printf("\n"); } - if (i2c_acquire(dev->params.dev)) { - DEBUG_DEV("could not acquire I2C bus", dev); - return -APDS99XX_ERROR_I2C; - } + i2c_acquire(dev->params.dev); int res; diff --git a/drivers/at24cxxx/at24cxxx.c b/drivers/at24cxxx/at24cxxx.c index 9042f50e71..b5548d83eb 100644 --- a/drivers/at24cxxx/at24cxxx.c +++ b/drivers/at24cxxx/at24cxxx.c @@ -195,9 +195,7 @@ int at24cxxx_init(at24cxxx_t *dev, const at24cxxx_params_t *params) at24cxxx_disable_write_protect(dev); } /* Check I2C bus once */ - if (i2c_acquire(DEV_I2C_BUS)) { - return -AT24CXXX_I2C_ERROR; - } + i2c_acquire(DEV_I2C_BUS); i2c_release(DEV_I2C_BUS); return AT24CXXX_OK; } diff --git a/drivers/at24mac/at24mac.c b/drivers/at24mac/at24mac.c index e377bea3dc..f616b8644f 100644 --- a/drivers/at24mac/at24mac.c +++ b/drivers/at24mac/at24mac.c @@ -54,10 +54,7 @@ static int _read_reg(at24mac_t dev, uint8_t reg, void *dst, size_t size) return -ENOTSUP; } - res = i2c_acquire(params->i2c_dev); - if (res) { - return res; - } + i2c_acquire(params->i2c_dev); res = i2c_read_regs(params->i2c_dev, params->i2c_addr, reg, dst, size, 0); diff --git a/drivers/bh1900nux/bh1900nux.c b/drivers/bh1900nux/bh1900nux.c index f0e3e22b8d..b11955025e 100644 --- a/drivers/bh1900nux/bh1900nux.c +++ b/drivers/bh1900nux/bh1900nux.c @@ -46,15 +46,14 @@ int bh1900nux_read(const bh1900nux_t *dev, int16_t *temp) /* Read raw sensor value */ DEBUG("[bh1900nux] read temperature\n"); - ret = i2c_acquire(dev->i2c); - if (ret < 0) { - return BH1900NUX_ERR_I2C; - } + + i2c_acquire(dev->i2c); ret = i2c_read_regs(dev->i2c, dev->addr, BH1900NUX_REG_ADDR, &raw, sizeof(raw), 0); + i2c_release(dev->i2c); + if (ret < 0) { return ret; } - i2c_release(dev->i2c); /* Calculate temperature */ raw = (int16_t) ntohs(raw) >> 4; diff --git a/drivers/bmx280/bmx280.c b/drivers/bmx280/bmx280.c index 19fd33d3a1..dec3263596 100644 --- a/drivers/bmx280/bmx280.c +++ b/drivers/bmx280/bmx280.c @@ -81,9 +81,7 @@ static int _read_burst(const bmx280_t *dev, uint8_t reg, void *buf, size_t len) static inline int _acquire(const bmx280_t *dev) { - if (i2c_acquire(BUS) != 0) { - return BMX280_ERR_BUS; - } + i2c_acquire(BUS); return BMX280_OK; } diff --git a/drivers/ccs811/ccs811.c b/drivers/ccs811/ccs811.c index e6d947e5fd..2547379bb5 100644 --- a/drivers/ccs811/ccs811.c +++ b/drivers/ccs811/ccs811.c @@ -482,12 +482,9 @@ static int _reg_read(const ccs811_t *dev, uint8_t reg, uint8_t *data, uint32_t l DEBUG_DEV("read %"PRIu32" bytes from sensor registers starting at addr %02x", dev, len, reg); - int res = CCS811_OK; + int res; - if (i2c_acquire(dev->params.i2c_dev) != CCS811_OK) { - DEBUG_DEV("could not acquire I2C bus", dev); - return -CCS811_ERROR_I2C; - } + i2c_acquire(dev->params.i2c_dev); #if MODULE_CCS811_FULL if (gpio_is_valid(dev->params.wake_pin)) { @@ -545,10 +542,7 @@ static int _reg_write(const ccs811_t *dev, uint8_t reg, uint8_t *data, uint32_t printf("\n"); } - if (i2c_acquire(dev->params.i2c_dev)) { - DEBUG_DEV("could not acquire I2C bus", dev); - return -CCS811_ERROR_I2C; - } + i2c_acquire(dev->params.i2c_dev); #if MODULE_CCS811_FULL if (gpio_is_valid(dev->params.wake_pin)) { diff --git a/drivers/ds3231/ds3231.c b/drivers/ds3231/ds3231.c index 2a8bf752c9..bf046e8753 100644 --- a/drivers/ds3231/ds3231.c +++ b/drivers/ds3231/ds3231.c @@ -96,8 +96,8 @@ static int _read(const ds3231_t *dev, uint8_t reg, uint8_t *buf, size_t len, { int res; - if (acquire && i2c_acquire(dev->bus)) { - return -EIO; + if (acquire) { + i2c_acquire(dev->bus); } res = i2c_read_regs(dev->bus, DS3231_I2C_ADDR, reg, buf, len, 0); if (res < 0) { @@ -113,8 +113,8 @@ static int _read(const ds3231_t *dev, uint8_t reg, uint8_t *buf, size_t len, static int _write(const ds3231_t *dev, uint8_t reg, uint8_t *buf, size_t len, int acquire, int release) { - if (acquire && i2c_acquire(dev->bus)) { - return -EIO; + if (acquire) { + i2c_acquire(dev->bus); } if (i2c_write_regs(dev->bus, DS3231_I2C_ADDR, reg, buf, len, 0) < 0) { i2c_release(dev->bus); diff --git a/drivers/hmc5883l/hmc5883l.c b/drivers/hmc5883l/hmc5883l.c index b84c2656c4..53b898754a 100644 --- a/drivers/hmc5883l/hmc5883l.c +++ b/drivers/hmc5883l/hmc5883l.c @@ -234,11 +234,7 @@ static int _reg_read(const hmc5883l_t *dev, uint8_t reg, uint8_t *data, uint16_t DEBUG_DEV("read %d byte from sensor registers starting at addr 0x%02x", dev, len, reg); - if (i2c_acquire(dev->dev)) { - DEBUG_DEV("could not acquire I2C bus", dev); - return HMC5883L_ERROR_I2C; - } - + i2c_acquire(dev->dev); int res = i2c_read_regs(dev->dev, HMC5883L_I2C_ADDRESS, reg, data, len, 0); i2c_release(dev->dev); @@ -275,11 +271,7 @@ static int _reg_write(const hmc5883l_t *dev, uint8_t reg, uint8_t data) printf("\n"); } - if (i2c_acquire(dev->dev)) { - DEBUG_DEV("could not acquire I2C bus", dev); - return HMC5883L_ERROR_I2C; - } - + i2c_acquire(dev->dev); int res = i2c_write_regs(dev->dev, HMC5883L_I2C_ADDRESS, reg, &data, 1, 0); i2c_release(dev->dev); diff --git a/drivers/hsc/hsc.c b/drivers/hsc/hsc.c index c91103ea61..e18d24a892 100644 --- a/drivers/hsc/hsc.c +++ b/drivers/hsc/hsc.c @@ -46,9 +46,7 @@ int hsc_init(hsc_t *dev, const hsc_params_t *params) uint8_t buf[HSC_FULL_DATA_LENGTH]; /* Acquire exclusive access */ - if (i2c_acquire(DEV_I2C)) { - return -ENODEV; - } + i2c_acquire(DEV_I2C); if (i2c_read_bytes(DEV_I2C, DEV_ADDR, buf, sizeof(buf), 0) < 0) { i2c_release(DEV_I2C); @@ -120,9 +118,7 @@ static int _read_ut(const hsc_t *dev, int32_t *output) uint8_t buf[HSC_FULL_DATA_LENGTH]; /* Acquire exclusive access */ - if (i2c_acquire(DEV_I2C)) { - return -ENODEV; - } + i2c_acquire(DEV_I2C); if (i2c_read_bytes(DEV_I2C, DEV_ADDR, buf, sizeof(buf), 0) < 0) { i2c_release(DEV_I2C); @@ -144,9 +140,7 @@ static int _read_up(const hsc_t *dev, int32_t *output) uint8_t buf[HSC_FULL_DATA_LENGTH]; /* Acquire exclusive access */ - if (i2c_acquire(DEV_I2C)) { - return -ENODEV; - } + i2c_acquire(DEV_I2C); if (i2c_read_bytes(DEV_I2C, DEV_ADDR, buf, sizeof(buf), 0) < 0) { i2c_release(DEV_I2C); diff --git a/drivers/ina3221/ina3221.c b/drivers/ina3221/ina3221.c index 38725e7289..9a7b08d838 100644 --- a/drivers/ina3221/ina3221.c +++ b/drivers/ina3221/ina3221.c @@ -58,9 +58,7 @@ */ static int _read_reg(const ina3221_t *dev, uint8_t reg, uint16_t *out) { - if (i2c_acquire(dev->params.i2c)) { - return -EIO; - } + i2c_acquire(dev->params.i2c); int status = i2c_read_regs(dev->params.i2c, dev->params.addr, reg, out, INA3221_REG_LEN, 0); i2c_release(dev->params.i2c); @@ -87,9 +85,7 @@ static int _read_reg(const ina3221_t *dev, uint8_t reg, uint16_t *out) static int _write_reg(const ina3221_t *dev, uint8_t reg, uint16_t in) { in = htons(in); - if (i2c_acquire(dev->params.i2c)) { - return -EIO; - } + i2c_acquire(dev->params.i2c); int status = i2c_write_regs(dev->params.i2c, dev->params.addr, reg, &in, INA3221_REG_LEN, 0); i2c_release(dev->params.i2c); diff --git a/drivers/itg320x/itg320x.c b/drivers/itg320x/itg320x.c index 6ed3c09d72..75e328682c 100644 --- a/drivers/itg320x/itg320x.c +++ b/drivers/itg320x/itg320x.c @@ -299,11 +299,7 @@ static int _reg_read(const itg320x_t *dev, uint8_t reg, uint8_t *data, uint16_t DEBUG_DEV("read %d bytes from reg 0x%02x", dev, len, reg); - if (i2c_acquire(dev->params.dev) != 0) { - DEBUG_DEV("could not acquire the I2C bus", dev); - return ITG320X_ERROR_I2C; - } - + i2c_acquire(dev->params.dev); int res = i2c_read_regs(dev->params.dev, dev->params.addr, reg, data, len, 0); i2c_release(dev->params.dev); @@ -332,11 +328,7 @@ static int _reg_write(const itg320x_t *dev, uint8_t reg, uint8_t data) DEBUG_DEV("write 1 byte to reg 0x%02x: 0x%02x", dev, reg, data); - if (i2c_acquire(dev->params.dev) != 0) { - DEBUG_DEV("could not acquire the I2C bus", dev); - return ITG320X_ERROR_I2C; - } - + i2c_acquire(dev->params.dev); int res = i2c_write_regs(dev->params.dev, dev->params.addr, reg, &data, 1, 0); i2c_release(dev->params.dev); diff --git a/drivers/lis2dh12/lis2dh12.c b/drivers/lis2dh12/lis2dh12.c index c3c43ba9e7..6612418e32 100644 --- a/drivers/lis2dh12/lis2dh12.c +++ b/drivers/lis2dh12/lis2dh12.c @@ -105,7 +105,8 @@ static int _init_bus(const lis2dh12_t *dev) static int _acquire(const lis2dh12_t *dev) { - return i2c_acquire(BUS); + i2c_acquire(BUS); + return BUS_OK; } static void _release(const lis2dh12_t *dev) diff --git a/drivers/lm75/lm75.c b/drivers/lm75/lm75.c index 624f3c58c9..8a78251fe7 100644 --- a/drivers/lm75/lm75.c +++ b/drivers/lm75/lm75.c @@ -66,9 +66,7 @@ int lm75_init(lm75_t *dev, const lm75_params_t *params) { uint8_t config = (params->shutdown_mode) | (params->tm_mode << 1) \ | (params->polarity << 2) | (params->fault_q << 3); - if (i2c_acquire(I2C_BUS) != 0) { - return LM75_ERROR_I2C; - } + i2c_acquire(I2C_BUS); /* read the device ID register of the TMP1075 sensor to confirm it is a TMP1075 */ if (IS_USED(MODULE_TMP1075) && (dev->lm75_params.res == &tmp1075_properties)) { @@ -112,9 +110,7 @@ int lm75_init(lm75_t *dev, const lm75_params_t *params) { int lm75_get_temperature_raw(lm75_t *dev, int *temperature) { int16_t temp; - if (i2c_acquire(I2C_BUS) != 0) { - return LM75_ERROR_I2C; - } + i2c_acquire(I2C_BUS); /* read the temperature register */ if (i2c_read_regs(I2C_BUS, I2C_ADDR, LM75_TEMP_REG, &temp, 2, 0) != 0) { i2c_release(I2C_BUS); @@ -184,9 +180,7 @@ int lm75_set_temp_limits(lm75_t *dev, int temp_hyst, int temp_os, gpio_cb_t cb, temp_os_short = temp_os_short << dev->lm75_params.res->os_shift; temp_os_short = ntohs(temp_os_short); - if (i2c_acquire(I2C_BUS) != 0) { - return LM75_ERROR_I2C; - } + i2c_acquire(I2C_BUS); if (i2c_write_regs(I2C_BUS, I2C_ADDR, LM75_THYST_REG, &temp_hyst_short, 2, 0) != 0) { i2c_release(I2C_BUS); @@ -207,9 +201,7 @@ int lm75_set_temp_limits(lm75_t *dev, int temp_hyst, int temp_os, gpio_cb_t cb, int lm75_get_os_temp(lm75_t *dev, int *temperature) { int16_t temp; - if (i2c_acquire(I2C_BUS) != 0) { - return LM75_ERROR_I2C; - } + i2c_acquire(I2C_BUS); /* read the temperature register */ if (i2c_read_regs(I2C_BUS, I2C_ADDR, LM75_TOS_REG, &temp, 2, 0) != 0) { i2c_release(I2C_BUS); @@ -230,9 +222,7 @@ int lm75_get_os_temp(lm75_t *dev, int *temperature) { int lm75_get_hyst_temp(lm75_t *dev, int *temperature) { int16_t temp; - if (i2c_acquire(I2C_BUS) != 0) { - return LM75_ERROR_I2C; - } + i2c_acquire(I2C_BUS); /* read the temperature register */ if (i2c_read_regs(I2C_BUS, I2C_ADDR, LM75_THYST_REG, &temp, 2, 0) != 0) { @@ -260,9 +250,7 @@ int lm75_get_os_pin(lm75_t *dev, bool *os_pin_state) { int lm75_poweroff(lm75_t *dev) { - if (i2c_acquire(I2C_BUS) != 0) { - return LM75_ERROR_I2C; - } + i2c_acquire(I2C_BUS); uint8_t config; @@ -291,9 +279,7 @@ int lm75_poweroff(lm75_t *dev) { int lm75_poweron(lm75_t *dev) { - if (i2c_acquire(I2C_BUS) != 0) { - return LM75_ERROR_I2C; - } + i2c_acquire(I2C_BUS); uint8_t config; if (i2c_read_reg(I2C_BUS, I2C_ADDR, LM75_CONF_REG, &config, 0) != 0) { @@ -328,9 +314,7 @@ int tmp1075_one_shot(lm75_t *dev) { } else { - if (i2c_acquire(I2C_BUS) != 0) { - return LM75_ERROR_I2C; - } + i2c_acquire(I2C_BUS); uint8_t config; if (i2c_read_reg(I2C_BUS, I2C_ADDR, LM75_CONF_REG, &config, 0) != 0) { diff --git a/drivers/mpu9x50/mpu9x50.c b/drivers/mpu9x50/mpu9x50.c index e571fc1668..20017a998b 100644 --- a/drivers/mpu9x50/mpu9x50.c +++ b/drivers/mpu9x50/mpu9x50.c @@ -117,9 +117,7 @@ int mpu9x50_set_accel_power(mpu9x50_t *dev, mpu9x50_pwr_t pwr_conf) } /* Acquire exclusive access */ - if (i2c_acquire(DEV_I2C)) { - return -1; - } + i2c_acquire(DEV_I2C); /* Read current power management 2 configuration */ i2c_read_reg(DEV_I2C, DEV_ADDR, MPU9X50_PWR_MGMT_2_REG, &pwr_2_setting, 0); @@ -158,9 +156,7 @@ int mpu9x50_set_gyro_power(mpu9x50_t *dev, mpu9x50_pwr_t pwr_conf) } /* Acquire exclusive access */ - if (i2c_acquire(DEV_I2C)) { - return -1; - } + i2c_acquire(DEV_I2C); /* Read current power management 2 configuration */ i2c_read_reg(DEV_I2C, DEV_ADDR, MPU9X50_PWR_MGMT_2_REG, &pwr_2_setting, 0); @@ -206,9 +202,7 @@ int mpu9x50_set_compass_power(mpu9x50_t *dev, mpu9x50_pwr_t pwr_conf) } /* Acquire exclusive access */ - if (i2c_acquire(DEV_I2C)) { - return -1; - } + i2c_acquire(DEV_I2C); /* Read current user control configuration */ i2c_read_reg(DEV_I2C, DEV_ADDR, MPU9X50_USER_CTRL_REG, &usr_ctrl_setting, 0); @@ -266,9 +260,7 @@ int mpu9x50_read_gyro(const mpu9x50_t *dev, mpu9x50_results_t *output) } /* Acquire exclusive access */ - if (i2c_acquire(DEV_I2C)) { - return -1; - } + i2c_acquire(DEV_I2C); /* Read raw data */ i2c_read_regs(DEV_I2C, DEV_ADDR, MPU9X50_GYRO_START_REG, data, 6, 0); /* Release the bus */ @@ -309,9 +301,7 @@ int mpu9x50_read_accel(const mpu9x50_t *dev, mpu9x50_results_t *output) } /* Acquire exclusive access */ - if (i2c_acquire(DEV_I2C)) { - return -1; - } + i2c_acquire(DEV_I2C); /* Read raw data */ i2c_read_regs(DEV_I2C, DEV_ADDR, MPU9X50_ACCEL_START_REG, data, 6, 0); /* Release the bus */ @@ -333,9 +323,7 @@ int mpu9x50_read_compass(const mpu9x50_t *dev, mpu9x50_results_t *output) uint8_t data[6]; /* Acquire exclusive access */ - if (i2c_acquire(DEV_I2C)) { - return -1; - } + i2c_acquire(DEV_I2C); /* Read raw data */ i2c_read_regs(DEV_I2C, DEV_ADDR, MPU9X50_EXT_SENS_DATA_START_REG, data, 6, 0); /* Release the bus */ @@ -366,9 +354,7 @@ int mpu9x50_read_temperature(const mpu9x50_t *dev, int32_t *output) uint16_t data; /* Acquire exclusive access */ - if (i2c_acquire(DEV_I2C)) { - return -1; - } + i2c_acquire(DEV_I2C); /* Read raw temperature value */ i2c_read_regs(DEV_I2C, DEV_ADDR, MPU9X50_TEMP_START_REG, &data, 2, 0); /* Release the bus */ @@ -392,9 +378,7 @@ int mpu9x50_set_gyro_fsr(mpu9x50_t *dev, mpu9x50_gyro_ranges_t fsr) case MPU9X50_GYRO_FSR_500DPS: case MPU9X50_GYRO_FSR_1000DPS: case MPU9X50_GYRO_FSR_2000DPS: - if (i2c_acquire(DEV_I2C)) { - return -1; - } + i2c_acquire(DEV_I2C); i2c_write_reg(DEV_I2C, DEV_ADDR, MPU9X50_GYRO_CFG_REG, (fsr << 3), 0); i2c_release(DEV_I2C); @@ -418,9 +402,7 @@ int mpu9x50_set_accel_fsr(mpu9x50_t *dev, mpu9x50_accel_ranges_t fsr) case MPU9X50_ACCEL_FSR_4G: case MPU9X50_ACCEL_FSR_8G: case MPU9X50_ACCEL_FSR_16G: - if (i2c_acquire(DEV_I2C)) { - return -1; - } + i2c_acquire(DEV_I2C); i2c_write_reg(DEV_I2C, DEV_ADDR, MPU9X50_ACCEL_CFG_REG, (fsr << 3), 0); i2c_release(DEV_I2C); @@ -447,9 +429,7 @@ int mpu9x50_set_sample_rate(mpu9x50_t *dev, uint16_t rate) /* Compute divider to achieve desired sample rate and write to rate div register */ divider = (1000 / rate - 1); - if (i2c_acquire(DEV_I2C)) { - return -1; - } + i2c_acquire(DEV_I2C); i2c_write_reg(DEV_I2C, DEV_ADDR, MPU9X50_RATE_DIV_REG, divider, 0); /* Store configured sample rate */ @@ -477,9 +457,7 @@ int mpu9x50_set_compass_sample_rate(mpu9x50_t *dev, uint8_t rate) /* Compute divider to achieve desired sample rate and write to slave ctrl register */ divider = (dev->conf.sample_rate / rate - 1); - if (i2c_acquire(DEV_I2C)) { - return -1; - } + i2c_acquire(DEV_I2C); i2c_write_reg(DEV_I2C, DEV_ADDR, MPU9X50_SLAVE4_CTRL_REG, divider, 0); i2c_release(DEV_I2C); diff --git a/drivers/pca9633/pca9633.c b/drivers/pca9633/pca9633.c index afaaded3af..a53fc70e25 100644 --- a/drivers/pca9633/pca9633.c +++ b/drivers/pca9633/pca9633.c @@ -259,9 +259,7 @@ int _write_reg(pca9633_t* dev, uint8_t reg, uint8_t data) { i2c_t i2c_dev = dev->params.i2c_dev; - if (i2c_acquire(i2c_dev) != 0) { - return -PCA9633_ERROR_I2C; - } + i2c_acquire(i2c_dev); int rc = i2c_write_reg(i2c_dev, dev->params.i2c_addr, reg, data, 0); i2c_release(i2c_dev); @@ -272,9 +270,7 @@ int _read_reg(pca9633_t* dev, uint8_t reg, uint8_t* data) { i2c_t i2c_dev = dev->params.i2c_dev; - if (i2c_acquire(i2c_dev) != 0) { - return -PCA9633_ERROR_I2C; - } + i2c_acquire(i2c_dev); int rc = i2c_read_reg(i2c_dev, dev->params.i2c_addr, reg, data, 0); i2c_release(i2c_dev); diff --git a/drivers/pca9685/pca9685.c b/drivers/pca9685/pca9685.c index 041f3648eb..a6c3e877b9 100644 --- a/drivers/pca9685/pca9685.c +++ b/drivers/pca9685/pca9685.c @@ -292,10 +292,7 @@ static int _read(const pca9685_t *dev, uint8_t reg, uint8_t *data, uint32_t len) DEBUG_DEV("reg=%02x data=%p len=%"PRIu32"", dev, reg, data, len); /* acquire the I2C device */ - if (i2c_acquire(dev->params.i2c_dev)) { - DEBUG_DEV("could not acquire I2C bus", dev); - return -PCA9685_ERROR_I2C; - } + i2c_acquire(dev->params.i2c_dev); if (i2c_read_regs(dev->params.i2c_dev, dev->params.i2c_addr, reg, data, len, 0) != 0) { @@ -313,10 +310,7 @@ static int _write(const pca9685_t *dev, uint8_t reg, const uint8_t *data, uint32 { DEBUG_DEV("reg=%02x data=%p len=%"PRIu32"", dev, reg, data, len); - if (i2c_acquire(dev->params.i2c_dev)) { - DEBUG_DEV("could not acquire I2C bus", dev); - return -PCA9685_ERROR_I2C; - } + i2c_acquire(dev->params.i2c_dev); if (i2c_write_regs(dev->params.i2c_dev, dev->params.i2c_addr, reg, data, len, 0) != 0) { diff --git a/drivers/qmc5883l/qmc5883l.c b/drivers/qmc5883l/qmc5883l.c index 9ce0bb7963..bd12183ce3 100644 --- a/drivers/qmc5883l/qmc5883l.c +++ b/drivers/qmc5883l/qmc5883l.c @@ -32,9 +32,7 @@ static int _reg_read(const qmc5883l_t *dev, uint8_t reg, uint8_t *val, int acquire, int release) { if (acquire) { - if (i2c_acquire(dev->i2c) != 0) { - return QMC5883L_BUSERR; - } + i2c_acquire(dev->i2c); } int res = i2c_read_reg(dev->i2c, ADDR, reg, val, 0); if ((release) || (res != 0)) { @@ -47,9 +45,7 @@ static int _reg_write(const qmc5883l_t *dev, uint8_t reg, uint8_t val, int acquire, int release) { if (acquire) { - if (i2c_acquire(dev->i2c) != 0) { - return QMC5883L_BUSERR; - } + i2c_acquire(dev->i2c); } int res = i2c_write_reg(dev->i2c, ADDR, reg, val, 0); if ((release) || (res != 0)) { diff --git a/drivers/sgp30/sgp30.c b/drivers/sgp30/sgp30.c index e25284ae4e..12d196b013 100644 --- a/drivers/sgp30/sgp30.c +++ b/drivers/sgp30/sgp30.c @@ -97,10 +97,7 @@ static int _rx_tx_data(sgp30_t *dev, uint16_t cmd, uint8_t *data, { int res = 0; - if (i2c_acquire(dev->params.i2c_dev) != 0) { - DEBUG("[sgp30]: could not acquire I2C bus %d\n", dev->params.i2c_dev); - return -1; - } + i2c_acquire(dev->params.i2c_dev); uint8_t frame_cmd[sizeof(cmd) + len]; frame_cmd[0] = cmd >> 8; diff --git a/drivers/sht3x/sht3x.c b/drivers/sht3x/sht3x.c index addb455cf4..e1c7fea945 100644 --- a/drivers/sht3x/sht3x.c +++ b/drivers/sht3x/sht3x.c @@ -283,16 +283,12 @@ static int _send_command(sht3x_dev_t* dev, uint16_t cmd) { ASSERT_PARAM (dev != NULL); - int res = SHT3X_OK; + int res; uint8_t data[2] = { cmd >> 8, cmd & 0xff }; DEBUG_DEV("send command 0x%02x%02x", dev, data[0], data[1]); - if (i2c_acquire(dev->i2c_dev) != 0) { - DEBUG_DEV ("could not acquire I2C bus", dev); - return -SHT3X_ERROR_I2C; - } - + i2c_acquire(dev->i2c_dev); res = i2c_write_bytes(dev->i2c_dev, dev->i2c_addr, (const void*)data, 2, 0); i2c_release(dev->i2c_dev); @@ -307,13 +303,9 @@ static int _send_command(sht3x_dev_t* dev, uint16_t cmd) static int _read_data(sht3x_dev_t* dev, uint8_t *data, uint8_t len) { - int res = SHT3X_OK; - - if (i2c_acquire(dev->i2c_dev) != 0) { - DEBUG_DEV ("could not acquire I2C bus", dev); - return -SHT3X_ERROR_I2C; - } + int res; + i2c_acquire(dev->i2c_dev); res = i2c_read_bytes(dev->i2c_dev, dev->i2c_addr, (void*)data, len, 0); i2c_release(dev->i2c_dev); diff --git a/drivers/sps30/sps30.c b/drivers/sps30/sps30.c index 2c2038f57e..c3d6d1b704 100644 --- a/drivers/sps30/sps30.c +++ b/drivers/sps30/sps30.c @@ -147,10 +147,7 @@ static int _rx_tx_data(const sps30_t *dev, uint16_t ptr_addr, int res = 0; unsigned retr = CONFIG_SPS30_ERROR_RETRY; - if (i2c_acquire(dev->p.i2c_dev) != 0) { - LOG_ERROR("could not acquire I2C bus %d\n", dev->p.i2c_dev); - return -SPS30_I2C_ERROR; - } + i2c_acquire(dev->p.i2c_dev); do { size_t addr_data_crc_len = SPS30_PTR_LEN + len + len / 2; diff --git a/drivers/tsl4531x/tsl4531x.c b/drivers/tsl4531x/tsl4531x.c index dfda6fa2a0..65002a28f7 100644 --- a/drivers/tsl4531x/tsl4531x.c +++ b/drivers/tsl4531x/tsl4531x.c @@ -43,11 +43,7 @@ int tsl4531x_init(tsl4531x_t *dev, const tsl4531x_params_t *params) uint8_t id; /* Initialise I2C bus */ - if ((r = i2c_acquire(params->i2c_dev)) < 0) { - DEBUG("I2C_dev is: %d.", params->i2c_dev); - DEBUG("[Error] Cannot acquire device. I2C error: %d\n", r); - return -ENODEV; - } + i2c_acquire(params->i2c_dev); /* Test for connectivity - verify ID and compare against stored value */ if ((r = i2c_read_reg(params->i2c_dev, @@ -107,10 +103,7 @@ int tsl4531x_set_low_power_mode(tsl4531x_t *dev, uint8_t low_power_mode) dev->low_power_mode = low_power_mode; - if ((r = i2c_acquire(dev->i2c_dev)) < 0) { - DEBUG("[Error] Cannot acquire device. I2C error: %d\n", r); - return -ENODEV; - } + i2c_acquire(dev->i2c_dev); if ((r = i2c_write_reg(dev->i2c_dev, dev->i2c_addr, @@ -142,10 +135,7 @@ int tsl4531x_start_sample(tsl4531x_t *dev) int r; - if ((r = i2c_acquire(dev->i2c_dev)) < 0) { - DEBUG("[Error] Cannot acquire device. I2C error: %d\n", r); - return -ENODEV; - } + i2c_acquire(dev->i2c_dev); if ((r = i2c_write_reg(dev->i2c_dev, dev->i2c_addr, @@ -195,10 +185,7 @@ int tsl4531x_get_sample(const tsl4531x_t *dev) int r; uint8_t als_data[2]; /* = {[DATALOW], [DATAHIGH]} */ - if ((r = i2c_acquire(dev->i2c_dev)) < 0) { - DEBUG("[Error] Cannot acquire device. I2C error: %d\n", r); - return -ENODEV; - } + i2c_acquire(dev->i2c_dev); if ((r = i2c_read_regs(dev->i2c_dev, dev->i2c_addr,