Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: accel: adxl345: cleanup regmap return values
Regmap return values sometimes are checked being less than zero
to trigger error handling. Sometimes this is checked for being not
zero. Unify the situation and check for not being zero.
Signed-off-by: Lothar Rubusch <l.rubusch@gmail.com>
Link: https://patch.msgid.link/20250313165049.48305-4-l.rubusch@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
authored by
Lothar Rubusch
and committed by
Jonathan Cameron
802ede1a
77d48f5e
+12
-12
+12
-12
drivers/iio/accel/adxl345_core.c
+12
-12
drivers/iio/accel/adxl345_core.c
···
133
133
ret = regmap_bulk_read(st->regmap,
134
134
ADXL345_REG_DATA_AXIS(chan->address),
135
135
&accel, sizeof(accel));
136
-
if (ret < 0)
136
+
if (ret)
137
137
return ret;
138
138
139
139
*val = sign_extend32(le16_to_cpu(accel), 12);
···
145
145
case IIO_CHAN_INFO_CALIBBIAS:
146
146
ret = regmap_read(st->regmap,
147
147
ADXL345_REG_OFS_AXIS(chan->address), ®val);
148
-
if (ret < 0)
148
+
if (ret)
149
149
return ret;
150
150
/*
151
151
* 8-bit resolution at +/- 2g, that is 4x accel data scale
···
156
156
return IIO_VAL_INT;
157
157
case IIO_CHAN_INFO_SAMP_FREQ:
158
158
ret = regmap_read(st->regmap, ADXL345_REG_BW_RATE, ®val);
159
-
if (ret < 0)
159
+
if (ret)
160
160
return ret;
161
161
162
162
samp_freq_nhz = ADXL345_BASE_RATE_NANO_HZ <<
···
266
266
267
267
/* FIFO should only be configured while in standby mode */
268
268
ret = adxl345_set_measure_en(st, false);
269
-
if (ret < 0)
269
+
if (ret)
270
270
return ret;
271
271
272
272
ret = regmap_read(st->regmap, ADXL345_REG_INT_MAP, &intio);
···
279
279
FIELD_PREP(ADXL345_FIFO_CTL_TRIGGER_MSK, intio) |
280
280
FIELD_PREP(ADXL345_FIFO_CTL_MODE_MSK,
281
281
st->fifo_mode));
282
-
if (ret < 0)
282
+
if (ret)
283
283
return ret;
284
284
285
285
return adxl345_set_measure_en(st, true);
···
300
300
int ret;
301
301
302
302
ret = regmap_read(st->regmap, ADXL345_REG_FIFO_STATUS, ®val);
303
-
if (ret < 0)
303
+
if (ret)
304
304
return ret;
305
305
306
306
return FIELD_GET(ADXL345_REG_FIFO_STATUS_MSK, regval);
···
328
328
/* read 3x 2 byte elements from base address into next fifo_buf position */
329
329
ret = regmap_bulk_read(st->regmap, ADXL345_REG_XYZ_BASE,
330
330
st->fifo_buf + (i * count / 2), count);
331
-
if (ret < 0)
331
+
if (ret)
332
332
return ret;
333
333
334
334
/*
···
386
386
387
387
st->fifo_mode = ADXL345_FIFO_BYPASS;
388
388
ret = adxl345_set_fifo(st);
389
-
if (ret < 0)
389
+
if (ret)
390
390
return ret;
391
391
392
392
return regmap_write(st->regmap, ADXL345_REG_INT_ENABLE, 0x00);
···
540
540
}
541
541
542
542
ret = regmap_read(st->regmap, ADXL345_REG_DEVID, ®val);
543
-
if (ret < 0)
543
+
if (ret)
544
544
return dev_err_probe(dev, ret, "Error reading device ID\n");
545
545
546
546
if (regval != ADXL345_DEVID)
···
549
549
550
550
/* Enable measurement mode */
551
551
ret = adxl345_set_measure_en(st, true);
552
-
if (ret < 0)
552
+
if (ret)
553
553
return dev_err_probe(dev, ret, "Failed to enable measurement mode\n");
554
554
555
555
ret = devm_add_action_or_reset(dev, adxl345_powerdown, st);
556
-
if (ret < 0)
556
+
if (ret)
557
557
return ret;
558
558
559
559
st->irq = fwnode_irq_get_byname(dev_fwnode(dev), "INT1");
···
591
591
ret = regmap_write(st->regmap, ADXL345_REG_FIFO_CTL,
592
592
FIELD_PREP(ADXL345_FIFO_CTL_MODE_MSK,
593
593
ADXL345_FIFO_BYPASS));
594
-
if (ret < 0)
594
+
if (ret)
595
595
return ret;
596
596
}
597
597