Commit 4917d927 authored Jul 17, 2007 by David Brownell Committed by Linus Torvalds Jul 17, 2007

spidev compiler warning gone

Get rid of annoying GCC warning on 32-bit platforms.

drivers/spi/spidev.c: In function 'spidev_message':
drivers/spi/spidev.c:184: warning: cast to pointer from integer of different size
drivers/spi/spidev.c:216: warning: cast to pointer from integer of different size

The trick is to add an extra cast using "ptrdiff_t" to convert the u64 to
the correct size integer, and only then casting it into a "void *" pointer.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ad241528

drivers/spi/spidev.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -181,7 +181,8 @@ static int spidev_message(struct spidev_data *spidev,
		}
		if (u_tmp->tx_buf) {
		k_tmp->tx_buf = buf;
		if (copy_from_user(buf, (const u8 __user *)u_tmp->tx_buf,
		if (copy_from_user(buf, (const u8 __user *)
		(ptrdiff_t) u_tmp->tx_buf,
		u_tmp->len))
		goto done;
		}
		@@ -213,7 +214,8 @@ static int spidev_message(struct spidev_data *spidev,
		buf = spidev->buffer;
		for (n = n_xfers, u_tmp = u_xfers; n; n--, u_tmp++) {
		if (u_tmp->rx_buf) {
		if (__copy_to_user((u8 __user *)u_tmp->rx_buf, buf,
		if (__copy_to_user((u8 __user *)
		(ptrdiff_t) u_tmp->rx_buf, buf,
		u_tmp->len)) {
		status = -EFAULT;
		goto done;