]> git.baikalelectronics.ru Git - kernel.git/commitdiff
rcar-hpbdma: remove shdma_free_irq() calls
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Wed, 25 Sep 2013 22:28:37 +0000 (02:28 +0400)
committerVinod Koul <vinod.koul@intel.com>
Fri, 11 Oct 2013 01:54:35 +0000 (07:24 +0530)
Commit 95e99cd93b1bf52d151c84c9d29c26fdc509a7fd (DMA: shdma: switch to managed
resource allocation) got rid of shdma_free_irq() but  unfortunately got merged
later than commit 8820957d295fec50c0398a680034eb3c6dddfb3c (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>
drivers/dma/sh/rcar-hpbdma.c

index 45a520281ce10c7e1c8bf2ef6d18e6f253f72310..b2f50d8bd755c2dd97bd1495c9748cd5087381a0 100644 (file)
@@ -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;