diff options
| author | Mark Brown <broonie@kernel.org> | 2022-08-04 16:18:10 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-08-04 16:18:10 +0100 |
| commit | 40e928ea60bb99e66531dedade8a52150104707f (patch) | |
| tree | 59baa02dd8762d38133d8969f54bfa0b2608dd85 /drivers/iio/adc/ad7766.c | |
| parent | 41e44f06e4b7f87fbf9dae1f534949613f654086 (diff) | |
| parent | b5276c924497705ca927ad85a763c37f2de98349 (diff) | |
Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
# Conflicts:
# drivers/gpu/drm/msm/dp/dp_parser.h
# drivers/soundwire/intel.c
Diffstat (limited to 'drivers/iio/adc/ad7766.c')
| -rw-r--r-- | drivers/iio/adc/ad7766.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/iio/adc/ad7766.c b/drivers/iio/adc/ad7766.c index 51ee9482e0df..3079a0872947 100644 --- a/drivers/iio/adc/ad7766.c +++ b/drivers/iio/adc/ad7766.c @@ -45,13 +45,12 @@ struct ad7766 { struct spi_message msg; /* - * DMA (thus cache coherency maintenance) requires the + * DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. * Make the buffer large enough for one 24 bit sample and one 64 bit * aligned 64 bit timestamp. */ - unsigned char data[ALIGN(3, sizeof(s64)) + sizeof(s64)] - ____cacheline_aligned; + unsigned char data[ALIGN(3, sizeof(s64)) + sizeof(s64)] __aligned(IIO_DMA_MINALIGN); }; /* |