Arnd Bergmann 15cec530e4 dmaengine: mmp_pdma: fix mismerge ...

The merge between 2b7f65b11d87f "mmp_pdma: Style neatening" and
8010dad55a0ab0 "dma: add dma_get_any_slave_channel(), for use in of_xlate()"
caused a build error by leaving obsolete code in place:

  mmp_pdma.c: In function 'mmp_pdma_dma_xlate':
  mmp_pdma.c:909:31: error: 'candidate' undeclared
  mmp_pdma.c:912:3: error: label 'retry' used but not defined
  mmp_pdma.c:901:24: warning: unused variable 'c' [-Wunused-variable]

This removes the extraneous lines.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>

2014-01-29 17:38:57 +05:30

..

bestcomm

drivers: clean-up prom.h implicit includes

2013-10-09 20:04:04 -05:00

dw

dma: dw: use %pad instead of casting dma_addr_t

2014-01-20 13:56:37 +05:30

ioat

Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine

2013-11-16 12:02:36 +05:30

ipu

dmaengine: ipu: fix warnings from 64-bit dma_addr_t printouts

2013-11-13 14:10:48 +05:30

ppc4xx

drivers/dma: fix error return code

2014-01-20 14:58:03 +05:30

sh

rcar-hpbdma: initialise plane information when halted

2013-11-28 13:46:00 +05:30

acpi-dma.c

acpi-dma: align documentation with kernel-doc format

2014-01-26 17:33:57 +05:30

amba-pl08x.c

dma: pl08x: Export pl08x_filter_id

2014-01-28 08:45:54 +05:30

at_hdmac_regs.h

DMA: AT91: Get residual bytes in dma buffer

2013-07-05 11:40:31 +05:30

at_hdmac.c

Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine

2013-11-16 12:02:36 +05:30

bcm2835-dma.c

dmaengine: Add DMA_PRIVATE to BCM2835 driver

2014-01-20 12:31:50 +05:30

coh901318_lli.c

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2013-02-26 09:24:48 -08:00

coh901318.c

dmaengine: coh901318: use DMA_COMPLETE for dma completion status

2013-10-25 11:15:56 +05:30

coh901318.h

dma: coh901318: merge header files

2013-01-07 17:36:37 +01:00

cppi41.c

drivers/dma: fix error return code

2014-01-20 14:58:03 +05:30

dma-jz4740.c

dmaengine: jz4740: use DMA_COMPLETE for dma completion status

2013-10-25 11:15:58 +05:30

dmaengine.c

Merge branch 'topic/of' into for-linus

2014-01-07 21:36:24 +05:30

dmaengine.h

…

dmatest.c

DMA: dmatest: extend the "device" module parameter to 32 characters

2014-01-20 14:59:18 +05:30

edma.c

dma: edma: Set debug level to debugging messages

2013-12-18 21:44:02 +05:30

ep93xx_dma.c

dmaengine: remove DMA unmap from drivers

2013-11-14 11:04:38 -08:00

fsldma.c

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2013-11-20 13:20:24 -08:00

fsldma.h

DMA: Freescale: change BWC from 256 bytes to 1024 bytes

2014-01-20 13:13:22 +05:30

imx-dma.c

Merge branch 'for-linus' into next

2013-10-31 22:36:13 +05:30

imx-sdma.c

dma: imx-sdma: Assign a default script number for ROM firmware cases

2014-01-13 14:52:04 +05:30

intel_mid_dma_regs.h

…

intel_mid_dma.c

dmaengine: intel_mid_dma: use DMA_COMPLETE for dma completion status

2013-10-25 11:16:04 +05:30

iop-adma.c

Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine

2013-11-16 12:02:36 +05:30

iovlock.c

…

k3dma.c

dmaengine: k3dma: fix sparse warnings

2014-01-20 13:53:20 +05:30

Kconfig

dmaengine: Add MOXA ART DMA engine driver

2014-01-20 12:32:46 +05:30

Makefile

dmaengine: Add MOXA ART DMA engine driver

2014-01-20 12:32:46 +05:30

mmp_pdma.c

dmaengine: mmp_pdma: fix mismerge

2014-01-29 17:38:57 +05:30

mmp_tdma.c

dma:mmp_tdma: get sram pool through device tree

2014-01-09 17:46:20 +05:30

moxart-dma.c

dmaengine: Add MOXA ART DMA engine driver

2014-01-20 12:32:46 +05:30

mpc512x_dma.c

drivers: clean-up prom.h implicit includes

2013-10-09 20:04:04 -05:00

mv_xor.c

Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine

2013-11-16 12:02:36 +05:30

mv_xor.h

dma: mv_xor: Fix mis-usage of mmio 'base' and 'high_base' registers

2013-11-14 11:04:42 -08:00

mxs-dma.c

dma: mxs-dma: Use semaphores for cyclic DMA

2013-11-13 15:38:31 +05:30

of-dma.c

dma: add channel request API that supports deferred probe

2013-12-10 17:46:48 +05:30

omap-dma.c

dma: omap: Set debug level to debugging messages

2014-01-20 14:56:25 +05:30

pch_dma.c

pch_dma: Add MODULE_DEVICE_TABLE

2013-09-02 11:59:58 +05:30

pl330.c

dma: pl330: Use dma_get_slave_channel() in the of xlate callback

2014-01-20 13:50:49 +05:30

s3c24xx-dma.c

dma: fix build breakage in s3c24xx-dma

2013-12-04 11:24:30 +05:30

sa11x0-dma.c

dmaengine: sa11x0: use DMA_COMPLETE for dma completion status

2013-10-25 11:16:13 +05:30

sirf-dma.c

dmaengine: sirf: Add device_slave_caps interface

2014-01-20 13:17:31 +05:30

ste_dma40_ll.c

dmaengine: ste_dma40_ll: Replace meaningless register set with comment

2013-06-04 11:12:10 +02:00

ste_dma40_ll.h

dmaengine: ste_dma40: Remove unnecessary call to d40_phy_cfg()

2013-05-23 21:13:19 +02:00

ste_dma40.c

dmaengine: ste: use DMA_COMPLETE for dma completion status

2013-10-25 11:16:15 +05:30

tegra20-apb-dma.c

dma: tegra: add support for Tegra148/124

2014-01-20 14:35:52 +05:30

timb_dma.c

dmaengine: remove DMA unmap from drivers

2013-11-14 11:04:38 -08:00

TODO

…

txx9dmac.c

Merge commit 'dmaengine-3.13-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine

2013-11-16 12:02:36 +05:30

txx9dmac.h

…

virt-dma.c

…

virt-dma.h

dma: fix vchan_cookie_complete() debug print

2014-01-26 17:33:45 +05:30