evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MIPS: Alchemy: Simplify DMA channel allocation code.

Browse source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Manuel Lauss <manuel.lauss@googlemail.com>
This commit is contained in:
Ralf Baechle 2010-02-27 12:53:37 +01:00
parent 2bd0073656
commit da4afffc1d
1 changed files with 56 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
arch/mips/alchemy/common/dbdma.c
View file

@ -237,7 +237,7 @@ u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
void (*callback)(int, void *), void *callparam) void (*callback)(int, void *), void *callparam)
{ {
unsigned long flags; unsigned long flags;
u32 used, chan, rv; u32 used, chan;
u32 dcp; u32 dcp;
int i; int i;
dbdev_tab_t *stp, *dtp; dbdev_tab_t *stp, *dtp;
@ -260,7 +260,6 @@ u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
return 0; return 0;
used = 0; used = 0;
rv = 0;
/* Check to see if we can get both channels. */ /* Check to see if we can get both channels. */
spin_lock_irqsave(&au1xxx_dbdma_spin_lock, flags); spin_lock_irqsave(&au1xxx_dbdma_spin_lock, flags);
@ -281,7 +280,9 @@ u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
used++; used++;
spin_unlock_irqrestore(&au1xxx_dbdma_spin_lock, flags); spin_unlock_irqrestore(&au1xxx_dbdma_spin_lock, flags);
if (!used) { if (used)
return 0;
/* Let's see if we can allocate a channel for it. */ /* Let's see if we can allocate a channel for it. */
ctp = NULL; ctp = NULL;
chan = 0; chan = 0;
@ -326,18 +327,18 @@ u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
cp->ddma_cfg = i; cp->ddma_cfg = i;
au_sync(); au_sync();
/* Return a non-zero value that can be used to /*
* find the channel information in subsequent * Return a non-zero value that can be used to find the channel
* operations. * information in subsequent operations.
*/ */
rv = (u32)(&chan_tab_ptr[chan]); return (u32)(&chan_tab_ptr[chan]);
} else { }
/* Release devices */ /* Release devices */
stp->dev_flags &= ~DEV_FLAGS_INUSE; stp->dev_flags &= ~DEV_FLAGS_INUSE;
dtp->dev_flags &= ~DEV_FLAGS_INUSE; dtp->dev_flags &= ~DEV_FLAGS_INUSE;
}
} return 0;
return rv;
} }
EXPORT_SYMBOL(au1xxx_dbdma_chan_alloc); EXPORT_SYMBOL(au1xxx_dbdma_chan_alloc);