From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752531AbdFUODK (ORCPT ); Wed, 21 Jun 2017 10:03:10 -0400 Received: from terminus.zytor.com ([65.50.211.136]:55519 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751042AbdFUODG (ORCPT ); Wed, 21 Jun 2017 10:03:06 -0400 Date: Wed, 21 Jun 2017 06:59:53 -0700 From: tip-bot for Bartosz Golaszewski Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, marc.zyngier@arm.com, corbet@lwn.net, brgl@bgdev.pl, hpa@zytor.com, tglx@linutronix.de Reply-To: linux-kernel@vger.kernel.org, marc.zyngier@arm.com, mingo@kernel.org, corbet@lwn.net, brgl@bgdev.pl, hpa@zytor.com, tglx@linutronix.de In-Reply-To: <1496246820-13250-4-git-send-email-brgl@bgdev.pl> References: <1496246820-13250-4-git-send-email-brgl@bgdev.pl> To: linux-tip-commits@vger.kernel.org Subject: [tip:irq/core] irq/generic-chip: Export irq_init_generic_chip() locally Git-Commit-ID: f160203986a6ad23ab8077c4a25b260fe55d6e26 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 Commit-ID: f160203986a6ad23ab8077c4a25b260fe55d6e26 Gitweb: http://git.kernel.org/tip/f160203986a6ad23ab8077c4a25b260fe55d6e26 Author: Bartosz Golaszewski AuthorDate: Wed, 31 May 2017 18:06:58 +0200 Committer: Thomas Gleixner CommitDate: Wed, 21 Jun 2017 15:53:11 +0200 irq/generic-chip: Export irq_init_generic_chip() locally This function will be used in the devres variant of irq_alloc_generic_chip(). Signed-off-by: Bartosz Golaszewski Signed-off-by: Thomas Gleixner Acked-by: Marc Zyngier Cc: linux-doc@vger.kernel.org Cc: Jonathan Corbet Link: http://lkml.kernel.org/r/1496246820-13250-4-git-send-email-brgl@bgdev.pl --- kernel/irq/generic-chip.c | 7 +++---- kernel/irq/internals.h | 11 +++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c index ee32870..f7086b7 100644 --- a/kernel/irq/generic-chip.c +++ b/kernel/irq/generic-chip.c @@ -201,10 +201,9 @@ static void irq_writel_be(u32 val, void __iomem *addr) iowrite32be(val, addr); } -static void -irq_init_generic_chip(struct irq_chip_generic *gc, const char *name, - int num_ct, unsigned int irq_base, - void __iomem *reg_base, irq_flow_handler_t handler) +void irq_init_generic_chip(struct irq_chip_generic *gc, const char *name, + int num_ct, unsigned int irq_base, + void __iomem *reg_base, irq_flow_handler_t handler) { raw_spin_lock_init(&gc->lock); gc->num_ct = num_ct; diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index bc226e7..921a241 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h @@ -226,3 +226,14 @@ irq_pm_install_action(struct irq_desc *desc, struct irqaction *action) { } static inline void irq_pm_remove_action(struct irq_desc *desc, struct irqaction *action) { } #endif + +#ifdef CONFIG_GENERIC_IRQ_CHIP +void irq_init_generic_chip(struct irq_chip_generic *gc, const char *name, + int num_ct, unsigned int irq_base, + void __iomem *reg_base, irq_flow_handler_t handler); +#else +static inline void +irq_init_generic_chip(struct irq_chip_generic *gc, const char *name, + int num_ct, unsigned int irq_base, + void __iomem *reg_base, irq_flow_handler_t handler) { } +#endif /* CONFIG_GENERIC_IRQ_CHIP */