diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-03-10 15:54:46 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-04-08 21:42:27 +0200 |
| commit | f1dc6c4f77678979868fe220c6913890e13473d8 (patch) | |
| tree | 7c1e1c28537fe7dde8ed6708f8105dbe01fccaa4 /drivers/irqchip | |
| parent | 119fd635e383c1a58990e5805acc29f48ed3e360 (diff) | |
| download | lwn-f1dc6c4f77678979868fe220c6913890e13473d8.tar.gz lwn-f1dc6c4f77678979868fe220c6913890e13473d8.zip | |
irqchip: sunxi: Make use of the IRQCHIP_DECLARE macro
This allows to remove some boilerplate code. At the same time, call the
set_handle_irq function in the initialization function of the irqchip,
so that we can remove it from the machine declaration.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'drivers/irqchip')
| -rw-r--r-- | drivers/irqchip/irq-sunxi.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/irqchip/irq-sunxi.c b/drivers/irqchip/irq-sunxi.c index 10974fa42653..0fc49c577033 100644 --- a/drivers/irqchip/irq-sunxi.c +++ b/drivers/irqchip/irq-sunxi.c @@ -20,7 +20,10 @@ #include <linux/of_address.h> #include <linux/of_irq.h> -#include <linux/irqchip/sunxi.h> +#include <asm/exception.h> +#include <asm/mach/irq.h> + +#include "irqchip.h" #define SUNXI_IRQ_VECTOR_REG 0x00 #define SUNXI_IRQ_PROTECTION_REG 0x08 @@ -33,6 +36,8 @@ static void __iomem *sunxi_irq_base; static struct irq_domain *sunxi_irq_domain; +static asmlinkage void __exception_irq_entry sunxi_handle_irq(struct pt_regs *regs); + void sunxi_irq_ack(struct irq_data *irqd) { unsigned int irq = irqd_to_hwirq(irqd); @@ -125,20 +130,13 @@ static int __init sunxi_of_init(struct device_node *node, if (!sunxi_irq_domain) panic("%s: unable to create IRQ domain\n", node->full_name); - return 0; -} - -static struct of_device_id sunxi_irq_dt_ids[] __initconst = { - { .compatible = "allwinner,sunxi-ic", .data = sunxi_of_init }, - { } -}; + set_handle_irq(sunxi_handle_irq); -void __init sunxi_init_irq(void) -{ - of_irq_init(sunxi_irq_dt_ids); + return 0; } +IRQCHIP_DECLARE(allwinner_sunxi_ic, "allwinner,sunxi-ic", sunxi_of_init); -asmlinkage void __exception_irq_entry sunxi_handle_irq(struct pt_regs *regs) +static asmlinkage void __exception_irq_entry sunxi_handle_irq(struct pt_regs *regs) { u32 irq, hwirq; |