diff options
author | Axel Lin <axel.lin@ingics.com> | 2013-07-04 12:31:36 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-11-07 04:37:37 -0500 |
commit | 5702941eec32cfd7b8cf9e36a0936e48170011a4 (patch) | |
tree | f9a04d0c3b9683de5d02af31366dd8acbc0bb972 /arch/arm/mach-bcm2835/bcm2835.c | |
parent | b8d490c3de797c88cfcc3364c6e04d8900121cf9 (diff) |
irqchip: bcm2835: Convert to use IRQCHIP_DECLARE macro
This patch converts irq-bcm2835 driver to use the new IRQCHIP_DECLARE and
irqchip_init.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Tested-by: Stephen Warren <swarren@wwwdotorg.org>
Cc: Simon Arlott <simon@fire.lp0.eu>
Cc: Olof Johansson <olof@lixom.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-rpi-kernel@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/mach-bcm2835/bcm2835.c')
-rw-r--r-- | arch/arm/mach-bcm2835/bcm2835.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-bcm2835/bcm2835.c b/arch/arm/mach-bcm2835/bcm2835.c index 40686d7ef500..a4abd851905a 100644 --- a/arch/arm/mach-bcm2835/bcm2835.c +++ b/arch/arm/mach-bcm2835/bcm2835.c | |||
@@ -14,7 +14,7 @@ | |||
14 | 14 | ||
15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/irqchip/bcm2835.h> | 17 | #include <linux/irqchip.h> |
18 | #include <linux/of_address.h> | 18 | #include <linux/of_address.h> |
19 | #include <linux/of_platform.h> | 19 | #include <linux/of_platform.h> |
20 | #include <linux/clk/bcm2835.h> | 20 | #include <linux/clk/bcm2835.h> |
@@ -131,8 +131,7 @@ static const char * const bcm2835_compat[] = { | |||
131 | 131 | ||
132 | DT_MACHINE_START(BCM2835, "BCM2835") | 132 | DT_MACHINE_START(BCM2835, "BCM2835") |
133 | .map_io = bcm2835_map_io, | 133 | .map_io = bcm2835_map_io, |
134 | .init_irq = bcm2835_init_irq, | 134 | .init_irq = irqchip_init, |
135 | .handle_irq = bcm2835_handle_irq, | ||
136 | .init_machine = bcm2835_init, | 135 | .init_machine = bcm2835_init, |
137 | .init_time = clocksource_of_init, | 136 | .init_time = clocksource_of_init, |
138 | .restart = bcm2835_restart, | 137 | .restart = bcm2835_restart, |