David Brownell wrote: > From: David Brownell <[email protected]> > > Mr. Grep reports that the EDMA pause/resume and chain/unchain > calls are unused. Same in the old 2.6.10 code; there seems to > be no value in those routines. Delete! Saves about 400 bytes. > > Signed-off-by: David Brownell <[email protected]> > --- > arch/arm/mach-davinci/dma.c | 64 ---------------------------- > arch/arm/mach-davinci/include/mach/edma.h | 24 ---------- > 2 files changed, 88 deletions(-) > > --- a/arch/arm/mach-davinci/dma.c > +++ b/arch/arm/mach-davinci/dma.c > @@ -961,31 +961,6 @@ void davinci_get_dma_params(int lch, str > } > EXPORT_SYMBOL(davinci_get_dma_params); > > -/* > - * DMA pause - pauses the dma on the channel passed > - */ > -void davinci_pause_dma(int lch) > -{ > - if ((lch >= 0) && (lch < DAVINCI_EDMA_NUM_DMACH)) { > - unsigned int mask = (1 << (lch & 0x1f)); > - > - edma_shadow0_write_array(SH_EECR, lch >> 5, mask); > - } > -} > -EXPORT_SYMBOL(davinci_pause_dma); > -/* > - * DMA resume - resumes the dma on the channel passed > - */ > -void davinci_resume_dma(int lch) > -{ > - if ((lch >= 0) && (lch < DAVINCI_EDMA_NUM_DMACH)) { > - unsigned int mask = (1 << (lch & 0x1f)); > - > - edma_shadow0_write_array(SH_EESR, lch >> 5, mask); > - } > -} > -EXPORT_SYMBOL(davinci_resume_dma); > - > /** > * davinci_start_dma - start dma on a master channel > * @lch: logical master channel being activated > @@ -1126,45 +1101,6 @@ EXPORT_SYMBOL(davinci_dma_unlink_lch); > > > /****************************************************************************** > * > - * DMA channel chain - chains the two logical channels passed through by > - * ARGUMENTS: > - * lch - logical channel number, where the tcc field is to be set > - * lch_que - logical channel number or the param entry number, which is to be > - * chained to lch > - * > - > *****************************************************************************/ > -void davinci_dma_chain_lch(int lch, int lch_que) > -{ > - if ((lch >= 0) && (lch < DAVINCI_EDMA_NUM_DMACH) && > - (lch_que >= 0) && (lch_que < DAVINCI_EDMA_NUM_DMACH)) { > - /* program tcc */ > - edma_parm_modify(PARM_OPT, lch, ~TCC, > - ((lch_que & 0x3f) << 12) | TCCHEN); > - } > -} > -EXPORT_SYMBOL(davinci_dma_chain_lch); > - > -/****************************************************************************** > - * > - * DMA channel unchain - unchain the two logical channels passed through by > - * ARGUMENTS: > - * lch - logical channel number, from which the tcc field is to be removed > - * lch_que - logical channel number or the param entry number, which is to be > - * unchained from lch > - * > - > *****************************************************************************/ > -void davinci_dma_unchain_lch(int lch, int lch_que) > -{ > - /* reset TCCHEN */ > - if ((lch >= 0) && (lch < DAVINCI_EDMA_NUM_DMACH) && > - (lch_que >= 0) && (lch_que < DAVINCI_EDMA_NUM_DMACH)) { > - edma_parm_and(PARM_OPT, lch, ~TCCHEN); > - } > -} > -EXPORT_SYMBOL(davinci_dma_unchain_lch); > - > -/****************************************************************************** > - * > * It cleans ParamEntry qand bring back EDMA to initial state if media has > * been removed before EDMA has finished.It is usedful for removable media. > * Arguments: > --- a/arch/arm/mach-davinci/include/mach/edma.h > +++ b/arch/arm/mach-davinci/include/mach/edma.h > @@ -245,32 +245,8 @@ void davinci_dma_link_lch(int lch_head, > > *****************************************************************************/ > void davinci_dma_unlink_lch(int lch_head, int lch_queue); > > -/****************************************************************************** > - * > - * DMA channel chain - chains the two logical channels passed through by > - * ARGUMENTS: > - * lch_head - logical channel number, from which the link field is to be > removed > - * lch_queue - logical channel number or the param entry number, which is to > be > - * unlinked from lch_head > - * > - > *****************************************************************************/ > -void davinci_dma_chain_lch(int lch_head, int lch_queue); > - > -/****************************************************************************** > - * > - * DMA channel unchain - unchain the two logical channels passed through by > - * ARGUMENTS: > - * lch_head - logical channel number, from which the link field is to be > removed > - * lch_queue - logical channel number or the param entry number, which is to > be > - * unlinked from lch_head > - * > - > *****************************************************************************/ > -void davinci_dma_unchain_lch(int lch_head, int lch_queue); > - > void davinci_dma_getposition(int lch, dma_addr_t *src, dma_addr_t *dst); > void davinci_clean_channel(int lch); > -void davinci_pause_dma(int lch); > -void davinci_resume_dma(int lch); > > int davinci_alloc_iram(unsigned size); > void davinci_free_iram(unsigned addr, unsigned size); > > _______________________________________________ > Davinci-linux-open-source mailing list > [email protected] > http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source >
I'm using pause, resume in the audio RFC that I posted recently. If you'll let them live a month longer, they'll be used. If they were in mainline before submitting the audio changes to alsa, it would probably make them easier to accept. Of course, my use of them is a hack to fix the AIC33 codec not performing the pause and having the dma pause instead. But I think that particular codec problem is common enough to keep in. BTW, I really appreciate you cleaning up this code. The davinci_request_dma API still needs work. I think this function is trying to do too much making it overly complex. Thanks Troy _______________________________________________ Davinci-linux-open-source mailing list [email protected] http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
