Skip to content

Commit db8c79d

Browse files
committed
bmp581: code-style improvements
Remove extra-parentheses when operator precedence is implicit. Eliminate implicit integer to boolean conversions. Signed-off-by: Luis Ubieda <[email protected]>
1 parent 191b74f commit db8c79d

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

drivers/sensor/bosch/bmp581/bmp581.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static int power_up_check(const struct device *dev)
177177

178178
if (rslt == BMP5_OK) {
179179
/* Check if nvm_rdy status = 1 and nvm_err status = 0 to proceed */
180-
if ((nvm_status & BMP5_INT_NVM_RDY) && (!(nvm_status & BMP5_INT_NVM_ERR))) {
180+
if ((nvm_status & BMP5_INT_NVM_RDY) != 0 && (nvm_status & BMP5_INT_NVM_ERR) == 0) {
181181
rslt = BMP5_OK;
182182
} else {
183183
rslt = -EFAULT;
@@ -375,7 +375,7 @@ static int soft_reset(const struct device *dev)
375375
k_usleep(BMP5_DELAY_US_SOFT_RESET);
376376
ret = get_interrupt_status(&int_status, dev);
377377
if (ret == BMP5_OK) {
378-
if (int_status & BMP5_INT_ASSERTED_POR_SOFTRESET_COMPLETE) {
378+
if ((int_status & BMP5_INT_ASSERTED_POR_SOFTRESET_COMPLETE) != 0) {
379379
ret = BMP5_OK;
380380
} else {
381381
ret = -EFAULT;
@@ -635,7 +635,7 @@ static void bmp581_submit_one_shot(const struct device *dev, struct rtio_iodev_s
635635
const struct bmp581_config *conf = dev->config;
636636

637637
err = rtio_sqe_rx_buf(iodev_sqe, min_buf_len, min_buf_len, &buf, &buf_len);
638-
CHECKIF((err < 0) || (buf_len < min_buf_len) || !buf) {
638+
CHECKIF(err < 0 || buf_len < min_buf_len || !buf) {
639639
LOG_ERR("Failed to get a read buffer of size %u bytes", min_buf_len);
640640
rtio_iodev_sqe_err(iodev_sqe, err);
641641
return;

drivers/sensor/bosch/bmp581/bmp581_decoder.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ static int bmp581_decoder_decode(const uint8_t *buffer,
191191
do {
192192
err = bmp581_convert_raw_to_q31_value(&edata->header, &chan_spec,
193193
edata->frame, fit, out);
194-
} while ((err == 0) && (*fit < max_count));
194+
} while (err == 0 && *fit < max_count);
195195

196196
if (*fit == fit_0 || err != 0) {
197197
return err;
@@ -205,10 +205,10 @@ static bool bmp581_decoder_has_trigger(const uint8_t *buffer, enum sensor_trigge
205205
{
206206
const struct bmp581_encoded_data *edata = (const struct bmp581_encoded_data *)buffer;
207207

208-
if (((trigger == SENSOR_TRIG_DATA_READY) &&
209-
(edata->header.events & BMP581_EVENT_DRDY)) ||
210-
((trigger == SENSOR_TRIG_FIFO_WATERMARK) &&
211-
(edata->header.events & BMP581_EVENT_FIFO_WM))) {
208+
if ((trigger == SENSOR_TRIG_DATA_READY &&
209+
edata->header.events & BMP581_EVENT_DRDY) ||
210+
(trigger == SENSOR_TRIG_FIFO_WATERMARK &&
211+
edata->header.events & BMP581_EVENT_FIFO_WM)) {
212212
return true;
213213
}
214214

drivers/sensor/bosch/bmp581/bmp581_stream.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,14 +289,14 @@ void bmp581_stream_submit(const struct device *dev,
289289
data->stream.iodev_sqe = iodev_sqe;
290290

291291
if (atomic_cas(&data->stream.state, BMP581_STREAM_OFF, BMP581_STREAM_ON) ||
292-
(data->stream.enabled_mask != enabled_mask)) {
292+
data->stream.enabled_mask != enabled_mask) {
293293
struct rtio_sqe *int_src_sqe;
294294
uint8_t val = 0;
295295

296296
(void)atomic_set(&data->stream.state, BMP581_STREAM_ON);
297297
data->stream.enabled_mask = enabled_mask;
298298

299-
if (enabled_mask & BMP581_EVENT_FIFO_WM) {
299+
if ((enabled_mask & BMP581_EVENT_FIFO_WM) != 0) {
300300
err = bmp581_stream_prep_fifo_wm_async(dev);
301301
if (err < 0) {
302302
rtio_iodev_sqe_err(iodev_sqe, err);

0 commit comments

Comments
 (0)