From patchwork Thu Oct 11 19:04:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 1583571 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 34AE1DFABE for ; Thu, 11 Oct 2012 19:08:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759247Ab2JKTED (ORCPT ); Thu, 11 Oct 2012 15:04:03 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:36138 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759237Ab2JKTD4 (ORCPT ); Thu, 11 Oct 2012 15:03:56 -0400 Received: by mail-ie0-f174.google.com with SMTP id k13so3579765iea.19 for ; Thu, 11 Oct 2012 12:03:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=zlNlk9JA1B/3dh/k4hPL+XVLS5QTLIn1FWjWow6YL8s=; b=LH7bpA6ePdXT3yJKa0RtgCA4o0kgYDt5a5PrssnixtRok6DH3ifIWB2RdcvQ5ZSlcS 4G1jEJ5E9jzsfz2NPMnd6/hHFpjpiPOpTox3JdEOB8ZTAi+6+0n7GGQGniYtO7StnUc7 GVZqLvQYlxwdKB8fnuS6uz27jo9GBADHkkkP0StDCR0MUxJkG4JtONWwTdGKKShfd2fc lVnYm8zySavBfsavhU9WDuQ5DsAkPjdnaXl1q5ItoRo9sQJQCDZXv6FEelUh4TZKCEfY sFdtocfp5Pi+Wq1yIQ9HU74Svp4jevSGlFBxyz7OaxMZPu/kU0StD+5sMUrCseAcb29w /jiw== Received: by 10.50.236.99 with SMTP id ut3mr1875250igc.73.1349982236205; Thu, 11 Oct 2012 12:03:56 -0700 (PDT) Received: from beef.ohporter.com (cpe-24-166-64-7.neo.res.rr.com. [24.166.64.7]) by mx.google.com with ESMTPS id us4sm7461igc.9.2012.10.11.12.03.54 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Oct 2012 12:03:55 -0700 (PDT) From: Matt Porter To: Tony Lindgren , Sekhar Nori , Grant Likely , Mark Brown , Benoit Cousson , Russell King , Vinod Koul , Rob Landley , Chris Ball Cc: Devicetree Discuss , Linux OMAP List , Linux ARM Kernel List , Linux DaVinci Kernel List , Linux Kernel Mailing List , Linux Documentation List , Linux MMC List , Linux SPI Devel List , Arnd Bergmann , Dan Williams , Rob Herring Subject: [RFC PATCH v2 03/16] ARM: edma: remove unused transfer controller handlers Date: Thu, 11 Oct 2012 15:04:28 -0400 Message-Id: <1349982281-10785-4-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349982281-10785-1-git-send-email-mporter@ti.com> References: <1349982281-10785-1-git-send-email-mporter@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org 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 --- 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 4411087..a3d189d 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) @@ -1538,23 +1518,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: