From patchwork Mon Jul 27 20:55:15 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: 6876541 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A17CD9F358 for ; Mon, 27 Jul 2015 20:56:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B94162052C for ; Mon, 27 Jul 2015 20:56:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D3F1C20738 for ; Mon, 27 Jul 2015 20:55:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754664AbbG0Uzh (ORCPT ); Mon, 27 Jul 2015 16:55:37 -0400 Received: from mail-oi0-f46.google.com ([209.85.218.46]:35431 "EHLO mail-oi0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752768AbbG0Uzg (ORCPT ); Mon, 27 Jul 2015 16:55:36 -0400 Received: by oihq81 with SMTP id q81so58637442oih.2 for ; Mon, 27 Jul 2015 13:55:36 -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=50qUJ18bhuixznzGvQJk3ZvoxAz4N2ybsctaxejJxNw=; b=wlXgoD44ZqRidpfshNn+SDa3KxrCVydiqUDi0PEdZJx3YyGrT0e5CyjV9kK/Vuo9UP 35vJQ9onZMpYygp2QW9mWHY8WxoK8+3JssLVt61gGnXjgHfQGO8mRFguxv3GpdkKUe42 S7KHW+RvGpwgkQPKitOmTOz91lJi0Pgjy3YrKKXSQFBF7PED0M0sj6f3z6Nwgc4xBy09 FVVIXPtHOh2ONxUD60C7Y/pfyhz+O1ne6oxFsG1wHmquRLsreQ1Oe+8MVUSDvCeD+NxF oiuv76W/iya8AMqGBGT/sHTnety7KwwGoyvVyhURxRoV1VjWc8dRqIOs7nDs9QbIlEA1 J88A== X-Received: by 10.202.223.198 with SMTP id w189mr28763365oig.133.1438030535992; Mon, 27 Jul 2015 13:55:35 -0700 (PDT) Received: from rob-hp-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by smtp.googlemail.com with ESMTPSA id n9sm11141549obo.12.2015.07.27.13.55.35 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Jul 2015 13:55:35 -0700 (PDT) From: Rob Herring To: Dan Williams , Vinod Koul Cc: Thomas Gleixner , dmaengine@vger.kernel.org Subject: [PATCH v3] dma: kill off set_irq_flags usage Date: Mon, 27 Jul 2015 15:55:15 -0500 Message-Id: <1438030523-15853-3-git-send-email-robh@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1438030523-15853-1-git-send-email-robh@kernel.org> References: <1438030523-15853-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=-8.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 modify 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 --- Thomas asked that this be merged thru subsystem trees instead of arm-soc, so please apply this to your tree. Rob drivers/dma/ipu/ipu_irq.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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); }