From patchwork Sat Aug 29 23:01:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 7095801 Return-Path: X-Original-To: patchwork-linux-sh@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 842329F1CD for ; Sat, 29 Aug 2015 23:01:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9CF1F207F8 for ; Sat, 29 Aug 2015 23:01:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A62F207FB for ; Sat, 29 Aug 2015 23:01:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752557AbbH2XBq (ORCPT ); Sat, 29 Aug 2015 19:01:46 -0400 Received: from mail-ob0-f170.google.com ([209.85.214.170]:34836 "EHLO mail-ob0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752685AbbH2XBp (ORCPT ); Sat, 29 Aug 2015 19:01:45 -0400 Received: by obbwr7 with SMTP id wr7so66995680obb.2 for ; Sat, 29 Aug 2015 16:01:45 -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=w8wyG18uZrxRLqwsfgtfEWWhQ0HIvhZR+AYEVk0Xsig=; b=JsL4B/OmUlghbVO/k58oeNuZL4OTqSInZUWcaKPV8nFISH+5VCvh9/Ug4E75RucHwV RLwSBmLJYeM/vgHGWvcQcljD2X4ueP+j+m1wSgXBFbsYam4rq/4gq/69Lna3FQc7JC8J A+k02n+4EhjjxntFIOhV7fnX2urkKEVqEB+YrN6WUWJLZlqFaUIeSixhHzqTDML6OKXd 9VqvYXN2VYLgL1Cx8H6m4tMdX8Z+gjUF2XLZuOpO7/JmGqPARR9nEHEPIs1DcGGm3VBq ty0KzdCYGishq5NEiog10wZiIbh9mpl8ud4BMn6vJEEv63VVxHLJMNWVZh5F3SKHkuYF hjTg== X-Received: by 10.182.19.228 with SMTP id i4mr9561245obe.82.1440889305085; Sat, 29 Aug 2015 16:01:45 -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 o10sm6929450oia.19.2015.08.29.16.01.44 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 29 Aug 2015 16:01:44 -0700 (PDT) From: Rob Herring To: Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org, Russell King , Rob Herring , Magnus Damm , linux-sh@vger.kernel.org Subject: [RESEND PATCH v3 3/5] sh: kill off set_irq_flags usage Date: Sat, 29 Aug 2015 18:01:23 -0500 Message-Id: <1440889285-5637-4-git-send-email-robh@kernel.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1440889285-5637-1-git-send-email-robh@kernel.org> References: <1440889285-5637-1-git-send-email-robh@kernel.org> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.8 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 Acked-by: Simon Horman Cc: Magnus Damm Cc: linux-sh@vger.kernel.org --- drivers/sh/intc/internals.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/sh/intc/internals.h b/drivers/sh/intc/internals.h index 7dff08e..6ce7f0d 100644 --- a/drivers/sh/intc/internals.h +++ b/drivers/sh/intc/internals.h @@ -99,15 +99,7 @@ static inline struct intc_desc_int *get_intc_desc(unsigned int irq) */ static inline void activate_irq(int irq) { -#ifdef CONFIG_ARM - /* ARM requires an extra step to clear IRQ_NOREQUEST, which it - * sets on behalf of every irq_chip. Also sets IRQ_NOPROBE. - */ - set_irq_flags(irq, IRQF_VALID); -#else - /* same effect on other architectures */ - irq_set_noprobe(irq); -#endif + irq_modify_status(irq, IRQ_NOREQUEST, IRQ_NOPROBE); } static inline int intc_handle_int_cmp(const void *a, const void *b)