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/dac/ad5686.h | |
| 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/dac/ad5686.h')
| -rw-r--r-- | drivers/iio/dac/ad5686.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/iio/dac/ad5686.h b/drivers/iio/dac/ad5686.h index cd5fff9e9d53..b7ade3a6b9b6 100644 --- a/drivers/iio/dac/ad5686.h +++ b/drivers/iio/dac/ad5686.h @@ -13,6 +13,8 @@ #include <linux/mutex.h> #include <linux/kernel.h> +#include <linux/iio/iio.h> + #define AD5310_CMD(x) ((x) << 12) #define AD5683_DATA(x) ((x) << 4) @@ -137,7 +139,7 @@ struct ad5686_state { struct mutex lock; /* - * DMA (thus cache coherency maintenance) requires the + * DMA (thus cache coherency maintenance) may require the * transfer buffers to live in their own cache lines. */ @@ -145,7 +147,7 @@ struct ad5686_state { __be32 d32; __be16 d16; u8 d8[4]; - } data[3] ____cacheline_aligned; + } data[3] __aligned(IIO_DMA_MINALIGN); }; |