leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mxs/spi: Rework the mxs_ssp_timeout to be more readable

Browse Source 
Rework the mxs_ssp_timeout() function to make it a bit more readable
and hopefully less error prone. Also, have only one successful exit
from the function and one failing exit instead of two.

Finally, discard the udelay() from this function altogether, as this
tightloop is quick enough it's pointless.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Marek Vasut 2012-09-04 04:40:18 +02:00 committed by Mark Brown
parent 727c10e3e5
commit f13639dc60
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/spi/spi-mxs.c
View File

@ -177,25 +177,23 @@ static inline void mxs_spi_disable(struct mxs_spi *spi)
static int mxs_ssp_wait(struct mxs_spi *spi, int offset, int mask, bool set)
{
unsigned long timeout = jiffies + msecs_to_jiffies(SSP_TIMEOUT);
const unsigned long timeout = jiffies + msecs_to_jiffies(SSP_TIMEOUT);
struct mxs_ssp *ssp = &spi->ssp;
uint32_t reg;
while (1) {
do {
reg = readl_relaxed(ssp->base + offset);
if (set && ((reg & mask) == mask))
break;
if (!set)
reg = ~reg;
if (!set && ((~reg & mask) == mask))
break;
reg &= mask;
udelay(1);
if (reg == mask)
return 0;
} while (time_before(jiffies, timeout));
if (time_after(jiffies, timeout))
return -ETIMEDOUT;
}
return 0;
return -ETIMEDOUT;
}
static void mxs_ssp_dma_irq_callback(void *param)