@@ -98,14 +98,10 @@ struct ads124s_private {
struct gpio_desc *reset_gpio;
struct spi_device *spi;
struct mutex lock;
- /*
- * Used to correctly align data.
- * Ensure timestamp is naturally aligned.
- * Note that the full buffer length may not be needed if not
- * all channels are enabled, as long as the alignment of the
- * timestamp is maintained.
- */
- u32 buffer[ADS124S08_MAX_CHANNELS + sizeof(s64)/sizeof(u32)] __aligned(8);
+ struct {
+ u32 data[ADS124S08_MAX_CHANNELS];
+ aligned_s64 timestamp;
+ } buffer;
u8 data[5] __aligned(IIO_DMA_MINALIGN);
};
@@ -289,7 +285,7 @@ static irqreturn_t ads124s_trigger_handler(int irq, void *p)
if (ret)
dev_err(&priv->spi->dev, "Start ADC conversions failed\n");
- priv->buffer[j] = ads124s_read(indio_dev);
+ priv->buffer.data[j] = ads124s_read(indio_dev);
ret = ads124s_write_cmd(indio_dev, ADS124S08_STOP_CONV);
if (ret)
dev_err(&priv->spi->dev, "Stop ADC conversions failed\n");
@@ -297,8 +293,8 @@ static irqreturn_t ads124s_trigger_handler(int irq, void *p)
j++;
}
- iio_push_to_buffers_with_ts(indio_dev, priv->buffer, sizeof(priv->buffer),
- pf->timestamp);
+ iio_push_to_buffers_with_ts(indio_dev, &priv->buffer,
+ sizeof(priv->buffer), pf->timestamp);
iio_trigger_notify_done(indio_dev->trig);
Use a struct with aligned s64_timestamp instead of a padded array for the buffer used for iio_push_to_buffers_with_ts(). This makes it easier to see the correctness of the size and alignment of the buffer. Signed-off-by: David Lechner <dlechner@baylibre.com> --- drivers/iio/adc/ti-ads124s08.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)