diff options
| author | Peter Meerwald-Stadler <pmeerw@pmeerw.net> | 2017-10-27 22:45:41 +0300 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2017-12-02 13:41:05 +0300 |
| commit | fef79edc174dbe6002c5b46a005d0dc8f5e821ba (patch) | |
| tree | 9c2d26a09a13660511973b951c4561167d592892 /drivers/iio/health | |
| parent | 83e6415d565f6ddfa12a58c3f854c4504bdaa7f9 (diff) | |
| download | linux-fef79edc174dbe6002c5b46a005d0dc8f5e821ba.tar.xz | |
iio: health: max30102: Prepare for copying varying number of measurements
Current code assumes always 2 measurements (6 bytes) have to be copied,
prepare for more flexibility
Signed-off-by: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Acked-by: Matt Ranostay <matt.ranostay@konsulko.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio/health')
| -rw-r--r-- | drivers/iio/health/max30102.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/iio/health/max30102.c b/drivers/iio/health/max30102.c index da3b100c9ca2..37ddbada940d 100644 --- a/drivers/iio/health/max30102.c +++ b/drivers/iio/health/max30102.c @@ -58,7 +58,7 @@ enum max3012_led_idx { #define MAX30102_REG_FIFO_OVR_CTR 0x05 #define MAX30102_REG_FIFO_RD_PTR 0x06 #define MAX30102_REG_FIFO_DATA 0x07 -#define MAX30102_REG_FIFO_DATA_ENTRY_LEN 6 +#define MAX30102_REG_FIFO_DATA_BYTES 3 #define MAX30102_REG_FIFO_CONFIG 0x08 #define MAX30102_REG_FIFO_CONFIG_AVG_4SAMPLES BIT(1) @@ -198,6 +198,11 @@ static inline int max30102_fifo_count(struct max30102_data *data) return 0; } +#define MAX30102_COPY_DATA(i) \ + memcpy(&data->processed_buffer[(i)], \ + &buffer[(i) * MAX30102_REG_FIFO_DATA_BYTES], \ + MAX30102_REG_FIFO_DATA_BYTES) + static int max30102_read_measurement(struct max30102_data *data) { int ret; @@ -205,13 +210,13 @@ static int max30102_read_measurement(struct max30102_data *data) ret = i2c_smbus_read_i2c_block_data(data->client, MAX30102_REG_FIFO_DATA, - MAX30102_REG_FIFO_DATA_ENTRY_LEN, + 2 * MAX30102_REG_FIFO_DATA_BYTES, buffer); - memcpy(&data->processed_buffer[0], &buffer[0], 3); - memcpy(&data->processed_buffer[1], &buffer[3], 3); + MAX30102_COPY_DATA(0); + MAX30102_COPY_DATA(1); - return (ret == MAX30102_REG_FIFO_DATA_ENTRY_LEN) ? 0 : -EINVAL; + return (ret == 2 * MAX30102_REG_FIFO_DATA_BYTES) ? 0 : -EINVAL; } static irqreturn_t max30102_interrupt_handler(int irq, void *private) |