iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: riscpc: dma: make state a local variable

Browse Source 
Make state a local variable to avoid rewriting it in the DMA loop.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
This commit is contained in:
Russell King 2019-05-02 17:43:36 +01:00
parent 8194468fad
commit 39694ed0db
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/mach-rpc/dma.c
View File

@ -99,15 +99,15 @@ static irqreturn_t iomd_dma_handle(int irq, void *dev_id)
{ {
struct iomd_dma *idma = dev_id; struct iomd_dma *idma = dev_id;
unsigned long base = idma->base; unsigned long base = idma->base;
unsigned int state = idma->state;
unsigned int status;
do { do {
unsigned int status;
status = iomd_readb(base + ST); status = iomd_readb(base + ST);
if (!(status & DMA_ST_INT)) if (!(status & DMA_ST_INT))
return IRQ_HANDLED; goto out;
if ((idma->state ^ status) & DMA_ST_AB) if ((state ^ status) & DMA_ST_AB)
iomd_get_next_sg(idma); iomd_get_next_sg(idma);
switch (status & (DMA_ST_OFL | DMA_ST_AB)) { switch (status & (DMA_ST_OFL | DMA_ST_AB)) {
@ -115,14 +115,14 @@ static irqreturn_t iomd_dma_handle(int irq, void *dev_id)
case DMA_ST_AB: /* .IB */ case DMA_ST_AB: /* .IB */
iomd_writel(idma->cur_addr, base + CURA); iomd_writel(idma->cur_addr, base + CURA);
iomd_writel(idma->cur_len, base + ENDA); iomd_writel(idma->cur_len, base + ENDA);
idma->state = DMA_ST_AB; state = DMA_ST_AB;
break; break;
case DMA_ST_OFL | DMA_ST_AB: /* OIB */ case DMA_ST_OFL | DMA_ST_AB: /* OIB */
case 0: /* .IA */ case 0: /* .IA */
iomd_writel(idma->cur_addr, base + CURB); iomd_writel(idma->cur_addr, base + CURB);
iomd_writel(idma->cur_len, base + ENDB); iomd_writel(idma->cur_len, base + ENDB);
idma->state = 0; state = 0;
break; break;
} }
@ -131,9 +131,10 @@ static irqreturn_t iomd_dma_handle(int irq, void *dev_id)
break; break;
} while (1); } while (1);
idma->state = ~DMA_ST_AB; state = ~DMA_ST_AB;
disable_irq_nosync(irq); disable_irq_nosync(irq);
out:
idma->state = state;
return IRQ_HANDLED; return IRQ_HANDLED;
} }