linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: mporter@ti.com (Matt Porter)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v9 2/9] ARM: edma: remove unused transfer controller handlers
Date: Wed,  6 Mar 2013 11:15:32 -0500	[thread overview]
Message-ID: <1362586540-10393-3-git-send-email-mporter@ti.com> (raw)
In-Reply-To: <1362586540-10393-1-git-send-email-mporter@ti.com>

Fix build on OMAP, the irqs are undefined on AM33xx.
These error interrupt handlers were hardcoded as disabled
so since they are unused code, simply remove them.

Signed-off-by: Matt Porter <mporter@ti.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
---
 arch/arm/common/edma.c |   37 -------------------------------------
 1 file changed, 37 deletions(-)

diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index dcaeb8e..a1db6cd 100644
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@ -494,26 +494,6 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-/******************************************************************************
- *
- * Transfer controller error interrupt handlers
- *
- *****************************************************************************/
-
-#define tc_errs_handled	false	/* disabled as long as they're NOPs */
-
-static irqreturn_t dma_tc0err_handler(int irq, void *data)
-{
-	dev_dbg(data, "dma_tc0err_handler\n");
-	return IRQ_HANDLED;
-}
-
-static irqreturn_t dma_tc1err_handler(int irq, void *data)
-{
-	dev_dbg(data, "dma_tc1err_handler\n");
-	return IRQ_HANDLED;
-}
-
 static int reserve_contiguous_slots(int ctlr, unsigned int id,
 				     unsigned int num_slots,
 				     unsigned int start_slot)
@@ -1541,23 +1521,6 @@ static int __init edma_probe(struct platform_device *pdev)
 		arch_num_cc++;
 	}
 
-	if (tc_errs_handled) {
-		status = request_irq(IRQ_TCERRINT0, dma_tc0err_handler, 0,
-					"edma_tc0", &pdev->dev);
-		if (status < 0) {
-			dev_dbg(&pdev->dev, "request_irq %d failed --> %d\n",
-				IRQ_TCERRINT0, status);
-			return status;
-		}
-		status = request_irq(IRQ_TCERRINT, dma_tc1err_handler, 0,
-					"edma_tc1", &pdev->dev);
-		if (status < 0) {
-			dev_dbg(&pdev->dev, "request_irq %d --> %d\n",
-				IRQ_TCERRINT, status);
-			return status;
-		}
-	}
-
 	return 0;
 
 fail:
-- 
1.7.9.5

  parent reply	other threads:[~2013-03-06 16:15 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-06 16:15 [PATCH v9 0/9] DMA Engine support for AM33XX Matt Porter
2013-03-06 16:15 ` [PATCH v9 1/9] ARM: davinci: move private EDMA API to arm/common Matt Porter
2013-06-05  8:54   ` Sekhar Nori
2013-06-07  6:17   ` Sekhar Nori
2013-06-07 11:15     ` Chris Ball
2013-03-06 16:15 ` Matt Porter [this message]
2013-03-06 16:15 ` [PATCH v9 3/9] ARM: edma: add AM33XX support to the private EDMA API Matt Porter
2013-03-07  6:42   ` Andy Shevchenko
2013-03-12 16:08     ` Matt Porter
2013-03-12  6:45   ` Sekhar Nori
     [not found]   ` <76caa6ddf7a143b381f30aa8fdfef3cc@DLEE71.ent.ti.com>
2013-03-12 16:22     ` Matt Porter
2013-03-06 16:15 ` [PATCH v9 4/9] dmaengine: edma: enable build for AM33XX Matt Porter
2013-03-06 16:15 ` [PATCH v9 5/9] dmaengine: edma: Add TI EDMA device tree binding Matt Porter
2013-03-06 20:24   ` Peter Korsgaard
2013-03-12  6:53   ` Sekhar Nori
     [not found]   ` <90c29a73df9e495f907517c49dd45b88@DFLE72.ent.ti.com>
2013-03-06 20:31     ` Matt Porter
2013-03-12 16:09     ` Matt Porter
2013-03-12 16:16       ` Peter Korsgaard
     [not found]   ` <1ced8cac7b9b41f596f0385e1f4f1f40@DFLE72.ent.ti.com>
2013-03-12 16:23     ` Matt Porter
2013-03-06 16:15 ` [PATCH v9 6/9] ARM: dts: add AM33XX EDMA support Matt Porter
2013-03-06 16:15 ` [PATCH v9 7/9] spi: omap2-mcspi: convert to dma_request_slave_channel_compat() Matt Porter
2013-03-06 16:15 ` [PATCH v9 8/9] spi: omap2-mcspi: add generic DMA request support to the DT binding Matt Porter
2013-03-06 16:15 ` [PATCH v9 9/9] ARM: dts: add AM33XX SPI DMA support Matt Porter
2013-04-03 11:45 ` [PATCH v9 0/9] DMA Engine support for AM33XX Sekhar Nori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1362586540-10393-3-git-send-email-mporter@ti.com \
    --to=mporter@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).