kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2011-05-12 10:41:31 -07:00
commit 49f019c188
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/input/touchscreen/ads7846.c
View file

@ -281,17 +281,24 @@ struct ser_req {
u8 command; u8 command;
u8 ref_off; u8 ref_off;
u16 scratch; u16 scratch;
__be16 sample;
struct spi_message msg; struct spi_message msg;
struct spi_transfer xfer[6]; 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 { struct ads7845_ser_req {
u8 command[3]; u8 command[3];
u8 pwrdown[3];
u8 sample[3];
struct spi_message msg; struct spi_message msg;
struct spi_transfer xfer[2]; 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) static int ads7846_read12_ser(struct device *dev, unsigned command)