aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/manage.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-09 08:44:17 -0500
committerThomas Gleixner <tglx@linutronix.de>2011-02-19 06:58:21 -0500
commit1ccb4e612f68ceefb888c2c6c1def6294ea8666d (patch)
treef3cae56489a56ebc54e06871abdf63193dc5a4bb /kernel/irq/manage.c
parent876dbd4cc1b35c1a4cb96a2be1d43ea0eabce3b4 (diff)
genirq: Wrap the remaning IRQ_* flags
Use wrappers to keep them away from the core code. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/manage.c')
-rw-r--r--kernel/irq/manage.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 9ae758ed8e66..b5de828e58d9 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -103,7 +103,7 @@ void irq_set_thread_affinity(struct irq_desc *desc)
103#ifdef CONFIG_GENERIC_PENDING_IRQ 103#ifdef CONFIG_GENERIC_PENDING_IRQ
104static inline bool irq_can_move_pcntxt(struct irq_desc *desc) 104static inline bool irq_can_move_pcntxt(struct irq_desc *desc)
105{ 105{
106 return desc->status & IRQ_MOVE_PCNTXT; 106 return irq_settings_can_move_pcntxt(desc);
107} 107}
108static inline bool irq_move_pending(struct irq_desc *desc) 108static inline bool irq_move_pending(struct irq_desc *desc)
109{ 109{
@@ -411,7 +411,7 @@ void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume)
411 if (desc->istate & IRQS_SUSPENDED) 411 if (desc->istate & IRQS_SUSPENDED)
412 goto err_out; 412 goto err_out;
413 /* Prevent probing on this irq: */ 413 /* Prevent probing on this irq: */
414 desc->status |= IRQ_NOPROBE; 414 irq_settings_set_noprobe(desc);
415 irq_enable(desc); 415 irq_enable(desc);
416 check_irq_resend(desc, irq); 416 check_irq_resend(desc, irq);
417 /* fall-through */ 417 /* fall-through */
@@ -526,7 +526,7 @@ int can_request_irq(unsigned int irq, unsigned long irqflags)
526 if (!desc) 526 if (!desc)
527 return 0; 527 return 0;
528 528
529 if (desc->status & IRQ_NOREQUEST) 529 if (!irq_settings_can_request(desc))
530 return 0; 530 return 0;
531 531
532 raw_spin_lock_irqsave(&desc->lock, flags); 532 raw_spin_lock_irqsave(&desc->lock, flags);
@@ -820,7 +820,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
820 * Check whether the interrupt nests into another interrupt 820 * Check whether the interrupt nests into another interrupt
821 * thread. 821 * thread.
822 */ 822 */
823 nested = desc->status & IRQ_NESTED_THREAD; 823 nested = irq_settings_is_nested_thread(desc);
824 if (nested) { 824 if (nested) {
825 if (!new->thread_fn) 825 if (!new->thread_fn)
826 return -EINVAL; 826 return -EINVAL;
@@ -917,7 +917,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
917 if (new->flags & IRQF_ONESHOT) 917 if (new->flags & IRQF_ONESHOT)
918 desc->istate |= IRQS_ONESHOT; 918 desc->istate |= IRQS_ONESHOT;
919 919
920 if (!(desc->status & IRQ_NOAUTOEN)) 920 if (irq_settings_can_autoenable(desc))
921 irq_startup(desc); 921 irq_startup(desc);
922 else 922 else
923 /* Undo nested disables: */ 923 /* Undo nested disables: */
@@ -1217,7 +1217,7 @@ int request_threaded_irq(unsigned int irq, irq_handler_t handler,
1217 if (!desc) 1217 if (!desc)
1218 return -EINVAL; 1218 return -EINVAL;
1219 1219
1220 if (desc->status & IRQ_NOREQUEST) 1220 if (!irq_settings_can_request(desc))
1221 return -EINVAL; 1221 return -EINVAL;
1222 1222
1223 if (!handler) { 1223 if (!handler) {
@@ -1292,7 +1292,7 @@ int request_any_context_irq(unsigned int irq, irq_handler_t handler,
1292 if (!desc) 1292 if (!desc)
1293 return -EINVAL; 1293 return -EINVAL;
1294 1294
1295 if (desc->status & IRQ_NESTED_THREAD) { 1295 if (irq_settings_is_nested_thread(desc)) {
1296 ret = request_threaded_irq(irq, NULL, handler, 1296 ret = request_threaded_irq(irq, NULL, handler,
1297 flags, name, dev_id); 1297 flags, name, dev_id);
1298 return !ret ? IRQC_IS_NESTED : ret; 1298 return !ret ? IRQC_IS_NESTED : ret;