From patchwork Tue Jun 9 18:26:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 6574441 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 30006C0020 for ; Tue, 9 Jun 2015 18:27:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4FC2320490 for ; Tue, 9 Jun 2015 18:27:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B6662051C for ; Tue, 9 Jun 2015 18:27:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753993AbbFIS1Z (ORCPT ); Tue, 9 Jun 2015 14:27:25 -0400 Received: from mail-oi0-f47.google.com ([209.85.218.47]:35315 "EHLO mail-oi0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753948AbbFIS1L (ORCPT ); Tue, 9 Jun 2015 14:27:11 -0400 Received: by oihd6 with SMTP id d6so16985611oih.2; Tue, 09 Jun 2015 11:27:10 -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:in-reply-to:references; bh=Kj2WpVoFOqNlgJGdm3J4XdrsCsDr6VQ4wwvjDfq+8Vo=; b=aHrjjzbDuTA7giYi3xl0Mz3CQTF11SVRVq0IDKFffI8Zp+4HaRL0QDFUSCGPI01R4V 7RbachVnMyboV4qPcErxb+db+Nrsnu1Va1M5AL+ljAHfef6HzVL8nA+8Jj55eq/uaAeu b6k+/tJKI6Lfxw17XsFyZjS+Tvm9EuC9qcMUrapENocY5qBHQoZ3hTas1z2WpSc8AEAL B06gZwHCR3huAVS/WSy5kZ4st3bnvtEtkLs3jNPtzqwvhauZJ+64WGc6ll7Ojz9kzxw2 hPAqxdIZj8uJBiSAvwqmtwypvrv2e4kQGK4SWu93xDy+hNuL51gBvDcyrelfJJENof1/ IOQg== X-Received: by 10.60.47.34 with SMTP id a2mr20390977oen.48.1433874428671; Tue, 09 Jun 2015 11:27:08 -0700 (PDT) Received: from rob-hp-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by mx.google.com with ESMTPSA id sm8sm4749946obb.13.2015.06.09.11.27.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Jun 2015 11:27:08 -0700 (PDT) From: Rob Herring To: Russell King , linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, arm@kernel.org, Rob Herring , Dan Williams , Vinod Koul , dmaengine@vger.kernel.org Subject: [PATCH 04/15] dma: kill off set_irq_flags usage Date: Tue, 9 Jun 2015 13:26:30 -0500 Message-Id: <1433874401-27161-5-git-send-email-robh@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1433874401-27161-1-git-send-email-robh@kernel.org> References: <1433874401-27161-1-git-send-email-robh@kernel.org> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP set_irq_flags is ARM specific with custom flags which have genirq equivalents. Convert drivers to use the genirq interfaces directly, so we can kill off set_irq_flags. The translation of flags is as follows: IRQF_VALID -> !IRQ_NOREQUEST IRQF_PROBE -> !IRQ_NOPROBE IRQF_NOAUTOEN -> IRQ_NOAUTOEN For IRQs managed by an irqdomain, the irqdomain core code handles clearing and setting IRQ_NOREQUEST already, so there is no need to do this in .map() functions and we can simply remove the set_irq_flags calls. Some users also set IRQ_NOPROBE and this has been maintained although it is not clear that is really needed. There appears to be a great deal of blind copy and paste of this code. Signed-off-by: Rob Herring Cc: Dan Williams Cc: Vinod Koul Cc: dmaengine@vger.kernel.org --- drivers/dma/ipu/ipu_irq.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/dma/ipu/ipu_irq.c b/drivers/dma/ipu/ipu_irq.c index 2e284a4..667ebba 100644 --- a/drivers/dma/ipu/ipu_irq.c +++ b/drivers/dma/ipu/ipu_irq.c @@ -377,9 +377,7 @@ int __init ipu_irq_attach_irq(struct ipu *ipu, struct platform_device *dev) irq_map[i].irq = irq; irq_map[i].source = -EINVAL; irq_set_handler(irq, handle_level_irq); -#ifdef CONFIG_ARM - set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); -#endif + irq_clear_status_flags(irq, IRQ_NOREQUEST | IRQ_NOPROBE); } irq_set_handler_data(ipu->irq_fn, ipu); @@ -406,9 +404,7 @@ void ipu_irq_detach_irq(struct ipu *ipu, struct platform_device *dev) irq_set_handler_data(ipu->irq_err, NULL); for (irq = irq_base; irq < irq_base + CONFIG_MX3_IPU_IRQS; irq++) { -#ifdef CONFIG_ARM - set_irq_flags(irq, 0); -#endif + irq_set_status_flags(irq, IRQ_NOREQUEST); irq_set_chip(irq, NULL); irq_set_chip_data(irq, NULL); }