leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spi: ftssp010_spi: Simplify code flow in ftssp010_[wait|wait_tx|wait_rx]

Browse Source 
No functional change, just simplify the code a bit.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
This commit is contained in:
Axel Lin 2015-01-08 09:47:22 +08:00 committed by Jagannadha Sutradharudu Teki
parent 1dc7d00f27
commit 78c80114b5
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/spi/ftssp010_spi.c
View File

@ -169,61 +169,49 @@ static int get_spi_gpio(int bus, struct ftssp010_gpio *chip)
static int ftssp010_wait(struct ftssp010_spi *chip) static int ftssp010_wait(struct ftssp010_spi *chip)
{ {
struct ftssp010_regs *regs = chip->regs; struct ftssp010_regs *regs = chip->regs;
int ret = -1;
ulong t; ulong t;
/* wait until device idle */ /* wait until device idle */
for (t = get_timer(0); get_timer(t) < CONFIG_FTSSP010_TIMEOUT; ) { for (t = get_timer(0); get_timer(t) < CONFIG_FTSSP010_TIMEOUT; ) {
if (readl(&regs->sr) & SR_BUSY) if (!(readl(&regs->sr) & SR_BUSY))
continue; return 0;
ret = 0;
break;
} }
if (ret) puts("ftspi010: busy timeout\n");
puts("ftspi010: busy timeout\n");
return ret; return -1;
} }
static int ftssp010_wait_tx(struct ftssp010_spi *chip) static int ftssp010_wait_tx(struct ftssp010_spi *chip)
{ {
struct ftssp010_regs *regs = chip->regs; struct ftssp010_regs *regs = chip->regs;
int ret = -1;
ulong t; ulong t;
/* wait until tx fifo not full */ /* wait until tx fifo not full */
for (t = get_timer(0); get_timer(t) < CONFIG_FTSSP010_TIMEOUT; ) { for (t = get_timer(0); get_timer(t) < CONFIG_FTSSP010_TIMEOUT; ) {
if (!(readl(&regs->sr) & SR_TFNF)) if (readl(&regs->sr) & SR_TFNF)
continue; return 0;
ret = 0;
break;
} }
if (ret) puts("ftssp010: tx timeout\n");
puts("ftssp010: tx timeout\n");
return ret; return -1;
} }
static int ftssp010_wait_rx(struct ftssp010_spi *chip) static int ftssp010_wait_rx(struct ftssp010_spi *chip)
{ {
struct ftssp010_regs *regs = chip->regs; struct ftssp010_regs *regs = chip->regs;
int ret = -1;
ulong t; ulong t;
/* wait until rx fifo not empty */ /* wait until rx fifo not empty */
for (t = get_timer(0); get_timer(t) < CONFIG_FTSSP010_TIMEOUT; ) { for (t = get_timer(0); get_timer(t) < CONFIG_FTSSP010_TIMEOUT; ) {
if (!SR_RFVE(readl(&regs->sr))) if (SR_RFVE(readl(&regs->sr)))
continue; return 0;
ret = 0;
break;
} }
if (ret) puts("ftssp010: rx timeout\n");
puts("ftssp010: rx timeout\n");
return ret; return -1;
} }
static int ftssp010_spi_work_transfer_v2(struct ftssp010_spi *chip, static int ftssp010_spi_work_transfer_v2(struct ftssp010_spi *chip,