aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2013-09-25 18:28:37 -0400
committerVinod Koul <vinod.koul@intel.com>2013-10-10 21:54:35 -0400
commitcdeb5c033f0389c44e5b36cafd623bdf44bbe25c (patch)
tree8d60b304ba5584aeba8d25824c3180302daaf3c4 /drivers/dma
parentd0e639c9e06d44e713170031fe05fb60ebe680af (diff)
rcar-hpbdma: remove shdma_free_irq() calls
Commit c1c63a14f4f2419d093acd7164eccdff315baa86 (DMA: shdma: switch to managed resource allocation) got rid of shdma_free_irq() but unfortunately got merged later than commit c4f6c41ba790bbbfcebb4c47a709ac8ff1fe1af9 (dma: add driver for R-Car HPB-DMAC), so that the HPB-DMAC driver retained the calls and got broken: drivers/dma/sh/rcar-hpbdma.c: In function `hpb_dmae_alloc_chan_resources': drivers/dma/sh/rcar-hpbdma.c:435: error: implicit declaration of function `shdma_free_irq' Fix this compilation error by removing the remaining shdma_free_irq() calls. Reported-by: Simon Horman <horms@verge.net.au> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Tested-by: Simon Horman <horms+renesas@verge.net.au> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/sh/rcar-hpbdma.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/dma/sh/rcar-hpbdma.c b/drivers/dma/sh/rcar-hpbdma.c
index 45a520281ce1..b2f50d8bd755 100644
--- a/drivers/dma/sh/rcar-hpbdma.c
+++ b/drivers/dma/sh/rcar-hpbdma.c
@@ -432,7 +432,6 @@ hpb_dmae_alloc_chan_resources(struct hpb_dmae_chan *hpb_chan,
432 hpb_chan->xfer_mode = XFER_DOUBLE; 432 hpb_chan->xfer_mode = XFER_DOUBLE;
433 } else { 433 } else {
434 dev_err(hpb_chan->shdma_chan.dev, "DCR setting error"); 434 dev_err(hpb_chan->shdma_chan.dev, "DCR setting error");
435 shdma_free_irq(&hpb_chan->shdma_chan);
436 return -EINVAL; 435 return -EINVAL;
437 } 436 }
438 437
@@ -614,7 +613,6 @@ static void hpb_dmae_chan_remove(struct hpb_dmae_device *hpbdev)
614 shdma_for_each_chan(schan, &hpbdev->shdma_dev, i) { 613 shdma_for_each_chan(schan, &hpbdev->shdma_dev, i) {
615 BUG_ON(!schan); 614 BUG_ON(!schan);
616 615
617 shdma_free_irq(schan);
618 shdma_chan_remove(schan); 616 shdma_chan_remove(schan);
619 } 617 }
620 dma_dev->chancnt = 0; 618 dma_dev->chancnt = 0;