From patchwork Mon Jul 27 20:55:17 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: 6888821 Return-Path: X-Original-To: patchwork-dri-devel@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 343099F39D for ; Wed, 29 Jul 2015 01:07:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 45DF02074A for ; Wed, 29 Jul 2015 01:07:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id EB9F52070D for ; Wed, 29 Jul 2015 01:07:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ADC8D720AE; Tue, 28 Jul 2015 18:07:27 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ob0-f171.google.com (mail-ob0-f171.google.com [209.85.214.171]) by gabe.freedesktop.org (Postfix) with ESMTPS id E396A6E17F for ; Mon, 27 Jul 2015 13:55:38 -0700 (PDT) Received: by obdeg2 with SMTP id eg2so69204332obd.0 for ; Mon, 27 Jul 2015 13:55:38 -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=+DFlqU9ntMqdqFJEp/EkoxhSzamqbVv/fOYgWwZVzlk=; b=YxKXb4MufqB2r0fIXm3WEiS6T7FQKW/NkA7xJW+hnsSpLtwxSKF7tU1ezTQXYRPzrj JPSlDT9Jip0eYq4EDv5DBhZqZKWGZjE0kIbOjJ3KkrGO8HtAIPeMy18TyEQBpTCOWDl4 iimILwgvM4vb7S+XzFopQzydoidvgsh+mB8teNz6CQkizHmJVUl2h4vwigasgerzuqP8 MX/ew7EO+3bMs3VgkbJHTiPoHM6PjOEi2ynQD/xq31oM42nQaRmvf/v+ljBfzpUTeSHn w99RP0XeT5Hk5iBChzMwi9DqfqEMxK81nDYd3RaLDMjTJYLAD+jNEnYb0kfC1TE8ea7p QIXw== X-Received: by 10.60.80.229 with SMTP id u5mr31300494oex.27.1438030538111; Mon, 27 Jul 2015 13:55:38 -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.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Jul 2015 13:55:37 -0700 (PDT) From: Rob Herring To: David Airlie Subject: [PATCH v3] gpu/drm: kill off set_irq_flags usage Date: Mon, 27 Jul 2015 15:55:17 -0500 Message-Id: <1438030523-15853-5-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> X-Mailman-Approved-At: Tue, 28 Jul 2015 18:07:08 -0700 Cc: Thomas Gleixner , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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: David Airlie Cc: dri-devel@lists.freedesktop.org --- Thomas asked that this be merged thru subsystem trees instead of arm-soc, so please apply this to your tree. Rob drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 1 - drivers/gpu/ipu-v3/ipu-common.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) -- 2.1.0 diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c index 33bd4c6..9a6a747 100644 --- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c +++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c @@ -165,7 +165,6 @@ static int mdp5_hw_irqdomain_map(struct irq_domain *d, irq_set_chip_and_handler(irq, &mdp5_hw_irq_chip, handle_level_irq); irq_set_chip_data(irq, mdp5_kms); - set_irq_flags(irq, IRQF_VALID); return 0; } diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c index 00f2058..4ac9e05 100644 --- a/drivers/gpu/ipu-v3/ipu-common.c +++ b/drivers/gpu/ipu-v3/ipu-common.c @@ -1099,8 +1099,7 @@ static int ipu_irq_init(struct ipu_soc *ipu) } ret = irq_alloc_domain_generic_chips(ipu->domain, 32, 1, "IPU", - handle_level_irq, 0, - IRQF_VALID, 0); + handle_level_irq, 0, 0, 0); if (ret < 0) { dev_err(ipu->dev, "failed to alloc generic irq chips\n"); irq_domain_remove(ipu->domain);