Skip to content

Commit 1a07f14

Browse files
committed
sensor: adxl345: refactor rtio
Refactor the rtio implementation as preparatory step for the read and decode implementation. Signed-off-by: Lothar Rubusch <[email protected]>
1 parent e8b721f commit 1a07f14

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

drivers/sensor/adi/adxl345/adxl345_rtio.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,33 @@ static void adxl345_submit_fetch(struct rtio_iodev_sqe *iodev_sqe)
1717
const struct sensor_read_config *cfg =
1818
(const struct sensor_read_config *) iodev_sqe->sqe.iodev->data;
1919
const struct device *dev = cfg->sensor;
20-
int rc;
2120
uint32_t min_buffer_len = sizeof(struct adxl345_dev_data);
2221
uint8_t *buffer;
2322
uint32_t buffer_len;
2423
struct adxl345_xyz_accel_data *data;
24+
int rc;
2525

26-
rc = rtio_sqe_rx_buf(iodev_sqe, min_buffer_len, min_buffer_len, &buffer, &buffer_len);
27-
if (rc != 0) {
28-
LOG_ERR("Failed to get a read buffer of size %u bytes", min_buffer_len);
29-
rtio_iodev_sqe_err(iodev_sqe, rc);
30-
return;
26+
rc = rtio_sqe_rx_buf(iodev_sqe, min_buffer_len, min_buffer_len,
27+
&buffer, &buffer_len);
28+
if (rc) {
29+
LOG_ERR("Failed to get a read buffer of size %u bytes",
30+
min_buffer_len);
31+
goto err;
3132
}
3233

3334
data = (struct adxl345_xyz_accel_data *)buffer;
3435

3536
rc = adxl345_get_accel_data(dev, data);
3637
if (rc) {
3738
LOG_ERR("Failed to fetch samples");
38-
rtio_iodev_sqe_err(iodev_sqe, rc);
39-
return;
39+
goto err;
4040
}
4141

4242
rtio_iodev_sqe_ok(iodev_sqe, 0);
43+
44+
return;
45+
err:
46+
rtio_iodev_sqe_err(iodev_sqe, rc);
4347
}
4448

4549
void adxl345_submit(const struct device *dev, struct rtio_iodev_sqe *iodev_sqe)

drivers/sensor/adi/adxl345/adxl345_trigger.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ int adxl345_trigger_set(const struct device *dev,
186186
{
187187
const struct adxl345_dev_config *cfg = dev->config;
188188
struct adxl345_dev_data *data = dev->data;
189-
uint8_t int_mask;
190189
int rc;
191190

192191
if (!cfg->gpio_int1.port && !cfg->gpio_int2.port) {

0 commit comments

Comments
 (0)