diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-09-04 14:43:13 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-09-04 14:43:13 -0400 |
commit | 7801907b8c4a49f8ec033d13a938751114a97a55 (patch) | |
tree | c8f3cb07b2f224313519fbc7157d1f647f74d107 /arch/arm/kernel/irq.c | |
parent | e24da5d316667a91b3a19b5761a211946ec649bb (diff) |
[ARM] Change irq_chip wake/type methods to set_wake/set_type
This is part of Thomas Gleixner's generic IRQ patch, which converts
ARM to use the generic IRQ subsystem. Here, we rename two of the
irq_chip methods - wake becomes set_wake, and type becomes set_type.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/irq.c')
-rw-r--r-- | arch/arm/kernel/irq.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 395137a8fad2..58b3bd000834 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c | |||
@@ -207,8 +207,8 @@ void enable_irq_wake(unsigned int irq) | |||
207 | unsigned long flags; | 207 | unsigned long flags; |
208 | 208 | ||
209 | spin_lock_irqsave(&irq_controller_lock, flags); | 209 | spin_lock_irqsave(&irq_controller_lock, flags); |
210 | if (desc->chip->wake) | 210 | if (desc->chip->set_wake) |
211 | desc->chip->wake(irq, 1); | 211 | desc->chip->set_wake(irq, 1); |
212 | spin_unlock_irqrestore(&irq_controller_lock, flags); | 212 | spin_unlock_irqrestore(&irq_controller_lock, flags); |
213 | } | 213 | } |
214 | EXPORT_SYMBOL(enable_irq_wake); | 214 | EXPORT_SYMBOL(enable_irq_wake); |
@@ -219,8 +219,8 @@ void disable_irq_wake(unsigned int irq) | |||
219 | unsigned long flags; | 219 | unsigned long flags; |
220 | 220 | ||
221 | spin_lock_irqsave(&irq_controller_lock, flags); | 221 | spin_lock_irqsave(&irq_controller_lock, flags); |
222 | if (desc->chip->wake) | 222 | if (desc->chip->set_wake) |
223 | desc->chip->wake(irq, 0); | 223 | desc->chip->set_wake(irq, 0); |
224 | spin_unlock_irqrestore(&irq_controller_lock, flags); | 224 | spin_unlock_irqrestore(&irq_controller_lock, flags); |
225 | } | 225 | } |
226 | EXPORT_SYMBOL(disable_irq_wake); | 226 | EXPORT_SYMBOL(disable_irq_wake); |
@@ -624,9 +624,9 @@ int set_irq_type(unsigned int irq, unsigned int type) | |||
624 | } | 624 | } |
625 | 625 | ||
626 | desc = irq_desc + irq; | 626 | desc = irq_desc + irq; |
627 | if (desc->chip->type) { | 627 | if (desc->chip->set_type) { |
628 | spin_lock_irqsave(&irq_controller_lock, flags); | 628 | spin_lock_irqsave(&irq_controller_lock, flags); |
629 | ret = desc->chip->type(irq, type); | 629 | ret = desc->chip->set_type(irq, type); |
630 | spin_unlock_irqrestore(&irq_controller_lock, flags); | 630 | spin_unlock_irqrestore(&irq_controller_lock, flags); |
631 | } | 631 | } |
632 | 632 | ||
@@ -846,8 +846,8 @@ unsigned long probe_irq_on(void) | |||
846 | 846 | ||
847 | irq_desc[i].probing = 1; | 847 | irq_desc[i].probing = 1; |
848 | irq_desc[i].triggered = 0; | 848 | irq_desc[i].triggered = 0; |
849 | if (irq_desc[i].chip->type) | 849 | if (irq_desc[i].chip->set_type) |
850 | irq_desc[i].chip->type(i, IRQT_PROBE); | 850 | irq_desc[i].chip->set_type(i, IRQT_PROBE); |
851 | irq_desc[i].chip->unmask(i); | 851 | irq_desc[i].chip->unmask(i); |
852 | irqs += 1; | 852 | irqs += 1; |
853 | } | 853 | } |