diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-02-15 01:06:49 +0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-15 01:06:49 +0400 |
| commit | 644bd954313254b54e08b69077e16831b6e04dfa (patch) | |
| tree | ab221a2731d42e3e990478b3ad747e8f60aa1715 | |
| parent | 7bb69bade0d41715bdf1b24f5ef0b8f798769fe9 (diff) | |
| download | linux-644bd954313254b54e08b69077e16831b6e04dfa.tar.xz | |
irq_domain: convert microblaze from irq_host to irq_domain
Trivial change, microblaze doesn't use irq remapping yet.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/microblaze/include/asm/irq.h | 4 | ||||
| -rw-r--r-- | arch/microblaze/kernel/irq.c | 2 | ||||
| -rw-r--r-- | arch/microblaze/kernel/setup.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/microblaze/include/asm/irq.h b/arch/microblaze/include/asm/irq.h index a175132e4496..7798ad14c610 100644 --- a/arch/microblaze/include/asm/irq.h +++ b/arch/microblaze/include/asm/irq.h @@ -39,7 +39,7 @@ static inline void irq_dispose_mapping(unsigned int virq) return; } -struct irq_host; +struct irq_domain; /** * irq_create_mapping - Map a hardware interrupt into linux virq space @@ -51,7 +51,7 @@ struct irq_host; * If the sense/trigger is to be specified, set_irq_type() should be called * on the number returned from that call. */ -extern unsigned int irq_create_mapping(struct irq_host *host, +extern unsigned int irq_create_mapping(struct irq_domain *host, irq_hw_number_t hwirq); #endif /* _ASM_MICROBLAZE_IRQ_H */ diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c index bbebcae72c02..3f613dfe5a07 100644 --- a/arch/microblaze/kernel/irq.c +++ b/arch/microblaze/kernel/irq.c @@ -51,7 +51,7 @@ next_irq: /* MS: There is no any advance mapping mechanism. We are using simple 32bit intc without any cascades or any connection that's why mapping is 1:1 */ -unsigned int irq_create_mapping(struct irq_host *host, irq_hw_number_t hwirq) +unsigned int irq_create_mapping(struct irq_domain *host, irq_hw_number_t hwirq) { return hwirq + IRQ_OFFSET; } diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index 604cd9dd1333..70e6d0b41ab4 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c @@ -51,8 +51,6 @@ void __init setup_arch(char **cmdline_p) unflatten_device_tree(); - /* NOTE I think that this function is not necessary to call */ - /* irq_early_init(); */ setup_cpuinfo(); microblaze_cache_init(); |