From c8fc657e6a114fadf78fdf8103e289a169c91c5d Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Mon, 6 Apr 2009 19:00:54 -0700 Subject: spi: limit reaches -1, tested 0 With a postfix decrement limit will reach -1 rather than 0, so the warning will not be issued. Also, add a cpu_relax() into the busy-wait loop. Signed-off-by: Roel Kluin Cc: Mariusz Ceier Acked-by: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/spi/spi_imx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/spi/spi_imx.c') diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 0480d8bb19d..014af69fc1b 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c @@ -779,7 +779,8 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data) /* Read trailing bytes */ limit = loops_per_jiffy << 1; - while ((read(drv_data) == 0) && limit--); + while ((read(drv_data) == 0) && --limit) + cpu_relax(); if (limit == 0) dev_err(&drv_data->pdev->dev, -- cgit v1.2.3-70-g09d2 From 96a6d9aa096aeb758273a8fb6388c279ecef5e7e Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Mon, 6 Apr 2009 19:00:57 -0700 Subject: spi_imx: set spi_master.dma_alignment = 4 Signed-off-by: Mike Rapoport Cc: Bryan Wu Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/spi/spi_imx.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/spi/spi_imx.c') diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 014af69fc1b..0671aeef579 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c @@ -186,6 +186,7 @@ #define QUEUE_STOPPED (1) #define IS_DMA_ALIGNED(x) (((u32)(x) & 0x03) == 0) +#define DMA_ALIGNMENT 4 /*-------------------------------------------------------------------------*/ @@ -1482,6 +1483,7 @@ static int __init spi_imx_probe(struct platform_device *pdev) master->bus_num = pdev->id; master->num_chipselect = platform_info->num_chipselect; + master->dma_alignment = DMA_ALIGNMENT; master->cleanup = cleanup; master->setup = setup; master->transfer = transfer; -- cgit v1.2.3-70-g09d2