Merge branch 'pcmcia' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[karo-tx-linux.git] / include / linux / irqdesc.h

diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
index fcea4e48e21f5d7060b2451673abf9a8f47d0001..5acfa26602e1b5839a1916e5f9da8e947a605271 100644 (file)
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
@@ -166,12 +166,16 @@ static inline int handle_domain_irq(struct irq_domain *domain,
 #endif
 
 /* Test to see if a driver has successfully requested an irq */
-static inline int irq_has_action(unsigned int irq)
+static inline int irq_desc_has_action(struct irq_desc *desc)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
        return desc->action != NULL;
 }
 
+static inline int irq_has_action(unsigned int irq)
+{
+       return irq_desc_has_action(irq_to_desc(irq));
+}
+
 /* caller has locked the irq_desc and both params are valid */
 static inline void __irq_set_handler_locked(unsigned int irq,
                                            irq_flow_handler_t handler)