From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Date: Wed, 25 Sep 2013 22:28:37 +0000 Subject: [PATCH 1/2] rcar-hpbdma: remove shdma_free_irq() calls Message-Id: <201309260228.37765.sergei.shtylyov@cogentembedded.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: vinod.koul@intel.com, dan.j.williams@intel.com Cc: linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, horms@verge.net.au 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 Signed-off-by: Sergei Shtylyov --- The patch is against 'fixes-3.12' branch of Vinod Koul's 'slave-dma.git' repo. drivers/dma/sh/rcar-hpbdma.c | 2 -- 1 file changed, 2 deletions(-) Index: slave-dma/drivers/dma/sh/rcar-hpbdma.c =================================--- slave-dma.orig/drivers/dma/sh/rcar-hpbdma.c +++ slave-dma/drivers/dma/sh/rcar-hpbdma.c @@ -432,7 +432,6 @@ hpb_dmae_alloc_chan_resources(struct hpb 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 shdma_for_each_chan(schan, &hpbdev->shdma_dev, i) { BUG_ON(!schan); - shdma_free_irq(schan); shdma_chan_remove(schan); } dma_dev->chancnt = 0; From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755020Ab3IYW2g (ORCPT ); Wed, 25 Sep 2013 18:28:36 -0400 Received: from mail-lb0-f180.google.com ([209.85.217.180]:54446 "EHLO mail-lb0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751226Ab3IYW2e (ORCPT ); Wed, 25 Sep 2013 18:28:34 -0400 To: vinod.koul@intel.com, dan.j.williams@intel.com Subject: [PATCH 1/2] rcar-hpbdma: remove shdma_free_irq() calls Cc: linux-kernel@vger.kernel.org, linux-sh@vger.kernel.org, horms@verge.net.au From: Sergei Shtylyov Organization: Cogent Embedded Date: Thu, 26 Sep 2013 02:28:37 +0400 MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201309260228.37765.sergei.shtylyov@cogentembedded.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Sergei Shtylyov --- The patch is against 'fixes-3.12' branch of Vinod Koul's 'slave-dma.git' repo. drivers/dma/sh/rcar-hpbdma.c | 2 -- 1 file changed, 2 deletions(-) Index: slave-dma/drivers/dma/sh/rcar-hpbdma.c =================================================================== --- slave-dma.orig/drivers/dma/sh/rcar-hpbdma.c +++ slave-dma/drivers/dma/sh/rcar-hpbdma.c @@ -432,7 +432,6 @@ hpb_dmae_alloc_chan_resources(struct hpb 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 shdma_for_each_chan(schan, &hpbdev->shdma_dev, i) { BUG_ON(!schan); - shdma_free_irq(schan); shdma_chan_remove(schan); } dma_dev->chancnt = 0;