diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-02-14 16:06:49 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-02-14 16:06:49 -0500 |
commit | 644bd954313254b54e08b69077e16831b6e04dfa (patch) | |
tree | ab221a2731d42e3e990478b3ad747e8f60aa1715 | |
parent | 7bb69bade0d41715bdf1b24f5ef0b8f798769fe9 (diff) |
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) | |||
39 | return; | 39 | return; |
40 | } | 40 | } |
41 | 41 | ||
42 | struct irq_host; | 42 | struct irq_domain; |
43 | 43 | ||
44 | /** | 44 | /** |
45 | * irq_create_mapping - Map a hardware interrupt into linux virq space | 45 | * irq_create_mapping - Map a hardware interrupt into linux virq space |
@@ -51,7 +51,7 @@ struct irq_host; | |||
51 | * If the sense/trigger is to be specified, set_irq_type() should be called | 51 | * If the sense/trigger is to be specified, set_irq_type() should be called |
52 | * on the number returned from that call. | 52 | * on the number returned from that call. |
53 | */ | 53 | */ |
54 | extern unsigned int irq_create_mapping(struct irq_host *host, | 54 | extern unsigned int irq_create_mapping(struct irq_domain *host, |
55 | irq_hw_number_t hwirq); | 55 | irq_hw_number_t hwirq); |
56 | 56 | ||
57 | #endif /* _ASM_MICROBLAZE_IRQ_H */ | 57 | #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: | |||
51 | 51 | ||
52 | /* MS: There is no any advance mapping mechanism. We are using simple 32bit | 52 | /* MS: There is no any advance mapping mechanism. We are using simple 32bit |
53 | intc without any cascades or any connection that's why mapping is 1:1 */ | 53 | intc without any cascades or any connection that's why mapping is 1:1 */ |
54 | unsigned int irq_create_mapping(struct irq_host *host, irq_hw_number_t hwirq) | 54 | unsigned int irq_create_mapping(struct irq_domain *host, irq_hw_number_t hwirq) |
55 | { | 55 | { |
56 | return hwirq + IRQ_OFFSET; | 56 | return hwirq + IRQ_OFFSET; |
57 | } | 57 | } |
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) | |||
51 | 51 | ||
52 | unflatten_device_tree(); | 52 | unflatten_device_tree(); |
53 | 53 | ||
54 | /* NOTE I think that this function is not necessary to call */ | ||
55 | /* irq_early_init(); */ | ||
56 | setup_cpuinfo(); | 54 | setup_cpuinfo(); |
57 | 55 | ||
58 | microblaze_cache_init(); | 56 | microblaze_cache_init(); |