Received: by 10.213.65.68 with SMTP id h4csp1742667imn; Sun, 1 Apr 2018 13:45:53 -0700 (PDT) X-Google-Smtp-Source: AIpwx49oZee8trxgO36SuyNzshxkzGRymlYYDc55/LqeKJnG0ERRr4ZJKymls1RjZd0pqNgZDZCd X-Received: by 10.99.52.135 with SMTP id b129mr4564228pga.308.1522615553902; Sun, 01 Apr 2018 13:45:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522615553; cv=none; d=google.com; s=arc-20160816; b=MoRSTqDRQgmvJpwH43IMhnoLP7f2mYEAmY0mEQunrTE+ss4CQ5jmMnXC+qoEYRgwRc muhrrZVDx0MzgttdL93L9q9bNFf1sH783oLyOAgLfhfN6M1qz98PznwU/JcD9UGAl+26 RO0C+AlCKsYpsVw4KR4sycPFI1w7hQB9A1lJEAekeVzR1S4X5vsdwnjp4qO39rEQZhQ4 m0fU+tCWOpD0INbPA5ntCUc5E4dq7kwoF7d+wTu/mKWYcBCcj3S6x3tbkNWQ1DKzWMEV ChokwQId+c5Ek6I32mEFPFrNpn0WpQWqGalVXt1u7eev8gDcZ1VpgWvGPFv3QLNYWd8B O3+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:to:from:subject :organization:arc-authentication-results; bh=+zC8Qkfnhm+m3WrrLu7WbvDZnZJzfffqg1V0XftGJnk=; b=q2otLRwVAUkug8yv6bxjxcwO7u+sxi4BO7QLwLKCuwT/Sp8LEdAZ+nFuf8D8Mw78WC Ith32Rgv84vF2LfTp38P9ci9lA7YQ0FWrxKxGCJ5Kq5NHmHFMLUuC4gNjb9uLp79IaxB QKDic773ZkuAIVRWjF7NP3jqexvRDKb7tafs7xpOtBIWOGU3dbVWjL2ixj5bRGrNrtS3 SvF1whHyPVjz/6sEc/gvSAghcpcz9sM/bJ0s2dyWCj1jr7XM9j7vXZFc6Cm+YycUNqHy wLZY7R0pRUca4TzCCJLc1T09OnzYTLQ9sBa5s01BlbMUXR/8RD5thtfQqEkNsUPrCB8t PGsw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 33-v6si13245130pla.452.2018.04.01.13.45.40; Sun, 01 Apr 2018 13:45:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754565AbeDAUnj (ORCPT + 99 others); Sun, 1 Apr 2018 16:43:39 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50690 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753901AbeDAUnf (ORCPT ); Sun, 1 Apr 2018 16:43:35 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8760D7705E for ; Sun, 1 Apr 2018 20:43:34 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-120-59.rdu2.redhat.com [10.10.120.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3781F111DCF0; Sun, 1 Apr 2018 20:43:34 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 33/45] C++: Move irqchip_irq_state enum From: David Howells To: linux-kernel@vger.kernel.org Date: Sun, 01 Apr 2018 21:43:33 +0100 Message-ID: <152261541370.30503.392919432710840130.stgit@warthog.procyon.org.uk> In-Reply-To: <152261521484.30503.16131389653845029164.stgit@warthog.procyon.org.uk> References: <152261521484.30503.16131389653845029164.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Sun, 01 Apr 2018 20:43:34 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Sun, 01 Apr 2018 20:43:34 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'dhowells@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move the irqchip_irq_state enum to linux/irqflags.h so that it is defined before its first use. Signed-off-by: David Howells --- include/linux/interrupt.h | 10 ---------- include/linux/irq.h | 1 - include/linux/irqflags.h | 10 ++++++++++ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 69c238210325..6975377bda00 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -413,16 +413,6 @@ static inline int disable_irq_wake(unsigned int irq) return irq_set_irq_wake(irq, 0); } -/* - * irq_get_irqchip_state/irq_set_irqchip_state specific flags - */ -enum irqchip_irq_state { - IRQCHIP_STATE_PENDING, /* Is interrupt pending? */ - IRQCHIP_STATE_ACTIVE, /* Is interrupt in progress? */ - IRQCHIP_STATE_MASKED, /* Is interrupt masked? */ - IRQCHIP_STATE_LINE_LEVEL, /* Is IRQ line high? */ -}; - extern int irq_get_irqchip_state(unsigned int irq, enum irqchip_irq_state which, bool *state); extern int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which, diff --git a/include/linux/irq.h b/include/linux/irq.h index a0231e96a578..34c1338215ae 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -32,7 +32,6 @@ struct seq_file; struct module; struct msi_msg; -enum irqchip_irq_state; /* * IRQ line status. diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h index 9700f00bbc04..59854eafbedf 100644 --- a/include/linux/irqflags.h +++ b/include/linux/irqflags.h @@ -159,4 +159,14 @@ do { \ #define irqs_disabled_flags(flags) raw_irqs_disabled_flags(flags) +/* + * irq_get_irqchip_state/irq_set_irqchip_state specific flags + */ +enum irqchip_irq_state { + IRQCHIP_STATE_PENDING, /* Is interrupt pending? */ + IRQCHIP_STATE_ACTIVE, /* Is interrupt in progress? */ + IRQCHIP_STATE_MASKED, /* Is interrupt masked? */ + IRQCHIP_STATE_LINE_LEVEL, /* Is IRQ line high? */ +}; + #endif