Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932671AbbFTRUI (ORCPT ); Sat, 20 Jun 2015 13:20:08 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60435 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932475AbbFTRUA (ORCPT ); Sat, 20 Jun 2015 13:20:00 -0400 Date: Sat, 20 Jun 2015 10:18:39 -0700 From: tip-bot for Jiang Liu Message-ID: Cc: bp@alien8.de, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, benh@kernel.crashing.org, bhelgaas@google.com, jiang.liu@linux.intel.com, tglx@linutronix.de, konrad.wilk@oracle.com, rdunlap@infradead.org, tony.luck@intel.com, yinghai@kernel.org, marc.zyngier@arm.com Reply-To: bp@alien8.de, hpa@zytor.com, mingo@kernel.org, jiang.liu@linux.intel.com, benh@kernel.crashing.org, bhelgaas@google.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, tony.luck@intel.com, rdunlap@infradead.org, konrad.wilk@oracle.com, yinghai@kernel.org, marc.zyngier@arm.com In-Reply-To: <1433145945-789-2-git-send-email-jiang.liu@linux.intel.com> References: <1433145945-789-2-git-send-email-jiang.liu@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain Git-Commit-ID: 7bbf1dd24b17b9ec4f47c43ce4e05bf190745553 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2429 Lines: 66 Commit-ID: 7bbf1dd24b17b9ec4f47c43ce4e05bf190745553 Gitweb: http://git.kernel.org/tip/7bbf1dd24b17b9ec4f47c43ce4e05bf190745553 Author: Jiang Liu AuthorDate: Mon, 1 Jun 2015 16:05:10 +0800 Committer: Thomas Gleixner CommitDate: Fri, 12 Jun 2015 16:54:21 +0200 genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain For irq associated with hierarchy irqdomains, there will be multiple irq_datas for one irq_desc. So enhance irq_data_to_desc() to support hierarchy irqdomain. Also export irq_data_to_desc() as an inline function for later reuse. Signed-off-by: Jiang Liu Cc: Konrad Rzeszutek Wilk Cc: Tony Luck Cc: Bjorn Helgaas Cc: Benjamin Herrenschmidt Cc: Randy Dunlap Cc: Yinghai Lu Cc: Borislav Petkov Cc: Marc Zyngier Link: http://lkml.kernel.org/r/1433145945-789-2-git-send-email-jiang.liu@linux.intel.com Signed-off-by: Thomas Gleixner --- include/linux/irqdesc.h | 9 +++++++++ kernel/irq/internals.h | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h index dd1109f..a113a8d 100644 --- a/include/linux/irqdesc.h +++ b/include/linux/irqdesc.h @@ -93,6 +93,15 @@ struct irq_desc { extern struct irq_desc irq_desc[NR_IRQS]; #endif +static inline struct irq_desc *irq_data_to_desc(struct irq_data *data) +{ +#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY + return irq_to_desc(data->irq); +#else + return container_of(data, struct irq_desc, irq_data); +#endif +} + static inline struct irq_data *irq_desc_get_irq_data(struct irq_desc *desc) { return &desc->irq_data; diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index df553b0..b93d434 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h @@ -59,8 +59,6 @@ enum { #include "debug.h" #include "settings.h" -#define irq_data_to_desc(data) container_of(data, struct irq_desc, irq_data) - extern int __irq_set_trigger(struct irq_desc *desc, unsigned int irq, unsigned long flags); extern void __disable_irq(struct irq_desc *desc, unsigned int irq); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/