Commit 20b918dc authored Oct 01, 2008 by Mike Rapoport Committed by Linus Torvalds Oct 01, 2008

pxa2xx_spi: fix build breakage



This patch fixes a build error in the pxa2xx-spi driver,
introduced by commit 7e964455
("pxa2xx_spi: dma bugfixes")

  CC      drivers/spi/pxa2xx_spi.o
drivers/spi/pxa2xx_spi.c: In function 'map_dma_buffers':
drivers/spi/pxa2xx_spi.c:331: error: invalid operands to binary &
drivers/spi/pxa2xx_spi.c:331: error: invalid operands to binary &
drivers/spi/pxa2xx_spi.c: In function 'pump_transfers':
drivers/spi/pxa2xx_spi.c:897: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'unsigned int'

[dbrownell@users.sourceforge.net: fix warning too ]

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent edfd222f

drivers/spi/pxa2xx_spi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ MODULE_ALIAS("platform:pxa2xx-spi");

		#define DMA_INT_MASK (DCSR_ENDINTR \| DCSR_STARTINTR \| DCSR_BUSERR)
		#define RESET_DMA_CHANNEL (DCSR_NODESC \| DMA_INT_MASK)
		#define IS_DMA_ALIGNED(x) (((x) & 0x07) == 0)
		#define IS_DMA_ALIGNED(x) ((((u32)(x)) & 0x07) == 0)
		#define MAX_DMA_LEN 8191

		/*
		@@ -896,7 +896,7 @@ static void pump_transfers(unsigned long data)
		\|\| transfer->rx_dma \|\| transfer->tx_dma) {
		dev_err(&drv_data->pdev->dev,
		"pump_transfers: mapped transfer length "
		"of %lu is greater than %d\n",
		"of %u is greater than %d\n",
		transfer->len, MAX_DMA_LEN);
		message->status = -EINVAL;
		giveback(drv_data);

Admin message