Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49f019c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6eaed0a4 28350e33

drivers/input/touchscreen/ads7846.c

+10 −3
Original line number Diff line number Diff line
@@ -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)