From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>,
Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] ARM: irq: Call irqchit_init if no init_irq function is specified
Date: Thu, 28 Mar 2013 10:41:43 +0100 [thread overview]
Message-ID: <1364463704-13692-2-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1364463704-13692-1-git-send-email-maxime.ripard@free-electrons.com>
More and more sub-architectures are using only the irqchip_init
function. Make the core code call this function if no init_irq field is
provided in the machine description to remove some boilerplate code.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/kernel/irq.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 8e4ef4c..df6f9a1 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -26,6 +26,7 @@
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
+#include <linux/irqchip.h>
#include <linux/random.h>
#include <linux/smp.h>
#include <linux/init.h>
@@ -114,7 +115,10 @@ EXPORT_SYMBOL_GPL(set_irq_flags);
void __init init_IRQ(void)
{
- machine_desc->init_irq();
+ if (machine_desc->init_irq)
+ machine_desc->init_irq();
+ else
+ irqchip_init();
}
#ifdef CONFIG_MULTI_IRQ_HANDLER
--
1.7.10.4
next parent reply other threads:[~2013-03-28 9:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1364463704-13692-1-git-send-email-maxime.ripard@free-electrons.com>
2013-03-28 9:41 ` Maxime Ripard [this message]
2013-03-28 14:48 ` Rob Herring
2013-03-28 14:51 ` Russell King - ARM Linux
2013-03-28 15:25 ` Arnd Bergmann
2013-03-28 15:36 ` Russell King - ARM Linux
2013-03-28 15:49 ` Arnd Bergmann
2013-03-28 18:20 ` Maxime Ripard
2013-03-28 18:40 ` Rob Herring
2013-03-28 19:02 ` Russell King - ARM Linux
2013-03-28 9:41 ` [PATCH 2/2] ARM: remove mach .init_irq for irqchip_init users Maxime Ripard
2013-03-28 12:42 ` Simon Horman
2013-03-28 18:24 ` Maxime Ripard
2013-03-29 3:48 ` Simon Horman
[not found] <1364503606-10597-1-git-send-email-maxime.ripard@free-electrons.com>
2013-03-28 20:46 ` [PATCH 1/2] ARM: irq: Call irqchit_init if no init_irq function is specified Maxime Ripard
2013-03-28 22:52 ` Rob Herring
2013-04-02 18:23 ` Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364463704-13692-2-git-send-email-maxime.ripard@free-electrons.com \
--to=maxime.ripard@free-electrons.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=olof@lixom.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®