From patchwork Tue Mar 5 20:53:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 2221901 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by patchwork1.kernel.org (Postfix) with ESMTP id 2144C3FCF6 for ; Tue, 5 Mar 2013 20:58:07 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id r25KsA1E013298; Tue, 5 Mar 2013 14:54:10 -0600 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r25KsApj005000; Tue, 5 Mar 2013 14:54:10 -0600 Received: from dlelxv23.itg.ti.com (172.17.1.198) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Tue, 5 Mar 2013 14:54:09 -0600 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id r25KsANO008861; Tue, 5 Mar 2013 14:54:10 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id C6F1C8063A; Tue, 5 Mar 2013 14:54:09 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id B7D5280628 for ; Tue, 5 Mar 2013 14:52:58 -0600 (CST) Received: from red.ext.ti.com (red.ext.ti.com [192.94.93.37]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id r25KqwEB005243 for ; Tue, 5 Mar 2013 14:52:58 -0600 (CST) Received: from mail6.bemta7.messagelabs.com (mail6.bemta7.messagelabs.com [216.82.255.55]) by red.ext.ti.com (8.13.7/8.13.7) with ESMTP id r25KqwkJ019930 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 5 Mar 2013 14:52:58 -0600 Received: from [216.82.253.147:31100] by server-9.bemta-7.messagelabs.com id 3A/C2-12335-A2B56315; Tue, 05 Mar 2013 20:52:58 +0000 X-Env-Sender: ohiomdp@gmail.com X-Msg-Ref: server-6.tower-165.messagelabs.com!1362516775!13040507!1 X-Originating-IP: [209.85.210.180] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.8.6; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19845 invoked from network); 5 Mar 2013 20:52:55 -0000 Received: from mail-ia0-f180.google.com (HELO mail-ia0-f180.google.com) (209.85.210.180) by server-6.tower-165.messagelabs.com with RC4-SHA encrypted SMTP; 5 Mar 2013 20:52:55 -0000 Received: by mail-ia0-f180.google.com with SMTP id f27so6506676iae.25 for ; Tue, 05 Mar 2013 12:52:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=UIyiVH8yyVn+TV4V7/EA0sXlxWdWiYqeQTwxPNoGpx8=; b=T/ONl1CF0ZCt4ZNHsnoEcjO8RFBWd2D8B7EJwcNe/gDpL528/m05IOQgawyDHFfxX0 fJx9/8UQ7wqt4Bh88dn8UaHAYLqAmoohDIoTSZMcchkwSXRt3EaWjW4pUYO6Zame94Fa 09AIlJ5unswhpryOYKAyfggkegd+qR5aHqFsZswpN3a2dLg94ugTMM6Uxm7TrK0qgBQb er8a197CWp1RWgjDHPKfzhIWhWKhKJk8ML41MvkdF/eY7QTj8sAg8N9MvRqhp2Ozc+6n OS6KKiVfV7rvnci9NVQVy/HiD96qSkX3CMJfkSfUD2xwLL/J0ZQ4bfttiY6adPcv43bj vALA== X-Received: by 10.50.173.73 with SMTP id bi9mr7854952igc.64.1362516775083; Tue, 05 Mar 2013 12:52:55 -0800 (PST) Received: from beef.ohporter.com (cpe-98-27-254-98.neo.res.rr.com. [98.27.254.98]) by mx.google.com with ESMTPS id gy3sm19430914igc.10.2013.03.05.12.52.53 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 05 Mar 2013 12:52:54 -0800 (PST) From: Matt Porter To: Tony Lindgren , Sekhar Nori , Grant Likely , Mark Brown , Benoit Cousson , Russell King , Rob Landley Subject: [PATCH v8 2/9] ARM: edma: remove unused transfer controller handlers Date: Tue, 5 Mar 2013 15:53:08 -0500 Message-ID: <1362516795-6346-3-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1362516795-6346-1-git-send-email-mporter@ti.com> References: <1362516795-6346-1-git-send-email-mporter@ti.com> CC: Linux DaVinci Kernel List , Arnd Bergmann , Linux Documentation List , Devicetree Discuss , Linux MMC List , Linux Kernel Mailing List , Rob Herring , Linux SPI Devel List , Linux OMAP List , Linux ARM Kernel List X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.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 Acked-by: Sekhar Nori --- 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: