diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2013-09-26 02:28:37 +0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-10-11 07:24:35 +0530 |
| commit | cdeb5c033f0389c44e5b36cafd623bdf44bbe25c (patch) | |
| tree | 8d60b304ba5584aeba8d25824c3180302daaf3c4 /drivers/dma | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
| download | kernel_goldelico_gta04-cdeb5c033f0389c44e5b36cafd623bdf44bbe25c.zip kernel_goldelico_gta04-cdeb5c033f0389c44e5b36cafd623bdf44bbe25c.tar.gz kernel_goldelico_gta04-cdeb5c033f0389c44e5b36cafd623bdf44bbe25c.tar.bz2 | |
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.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/dma/sh/rcar-hpbdma.c b/drivers/dma/sh/rcar-hpbdma.c index 45a5202..b2f50d8 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, hpb_chan->xfer_mode = XFER_DOUBLE; } else { dev_err(hpb_chan->shdma_chan.dev, "DCR setting error"); - shdma_free_irq(&hpb_chan->shdma_chan); return -EINVAL; } @@ -614,7 +613,6 @@ static void hpb_dmae_chan_remove(struct hpb_dmae_device *hpbdev) shdma_for_each_chan(schan, &hpbdev->shdma_dev, i) { BUG_ON(!schan); - shdma_free_irq(schan); shdma_chan_remove(schan); } dma_dev->chancnt = 0; |