diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 10:41:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 10:41:31 -0700 |
| commit | 49f019c188aa1e0ed5c8cffbcc5533dfb0e732dd (patch) | |
| tree | 4d60206230d1eb9182f1f565309cc90c6454c404 | |
| parent | 6eaed0a438ef554a282210a04da0de27b671d817 (diff) | |
| parent | 28350e330cfab46b60a1dbf763b678d859f9f3d9 (diff) | |
| download | linux-49f019c188aa1e0ed5c8cffbcc5533dfb0e732dd.tar.gz linux-49f019c188aa1e0ed5c8cffbcc5533dfb0e732dd.tar.bz2 linux-49f019c188aa1e0ed5c8cffbcc5533dfb0e732dd.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: ads7846 - remove unused variable from struct ads7845_ser_req
Input: ads7846 - make transfer buffers DMA safe
| -rw-r--r-- | drivers/input/touchscreen/ads7846.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index c24946f51256..1de1c19dad30 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -281,17 +281,24 @@ struct ser_req { u8 command; u8 ref_off; u16 scratch; - __be16 sample; struct spi_message msg; struct spi_transfer xfer[6]; + /* + * DMA (thus cache coherency maintenance) requires the + * transfer buffers to live in their own cache lines. + */ + __be16 sample ____cacheline_aligned; }; struct ads7845_ser_req { u8 command[3]; - u8 pwrdown[3]; - u8 sample[3]; struct spi_message msg; struct spi_transfer xfer[2]; + /* + * DMA (thus cache coherency maintenance) requires the + * transfer buffers to live in their own cache lines. + */ + u8 sample[3] ____cacheline_aligned; }; static int ads7846_read12_ser(struct device *dev, unsigned command) |