irq: remove handle_domain_{irq,nmi}()

[linux-2.6-microblaze.git] / kernel / irq / irqdesc.c

diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index 7041698..2267e65 100644 (file)
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -651,7 +651,11 @@ int handle_irq_desc(struct irq_desc *desc)
  * generic_handle_irq - Invoke the handler for a particular irq
  * @irq:       The irq number to handle
  *
- */
+ * Returns:    0 on success, or -EINVAL if conversion has failed
+ *
+ *             This function must be called from an IRQ context with irq regs
+ *             initialized.
+  */
 int generic_handle_irq(unsigned int irq)
 {
        return handle_irq_desc(irq_to_desc(irq));
@@ -661,77 +665,39 @@ EXPORT_SYMBOL_GPL(generic_handle_irq);
 #ifdef CONFIG_IRQ_DOMAIN
 /**
  * generic_handle_domain_irq - Invoke the handler for a HW irq belonging
- *                             to a domain, usually for a non-root interrupt
- *                             controller
+ *                             to a domain.
  * @domain:    The domain where to perform the lookup
  * @hwirq:     The HW irq number to convert to a logical one
  *
  * Returns:    0 on success, or -EINVAL if conversion has failed
  *
+ *             This function must be called from an IRQ context with irq regs
+ *             initialized.
  */
 int generic_handle_domain_irq(struct irq_domain *domain, unsigned int hwirq)
 {
+       WARN_ON_ONCE(!in_irq());
        return handle_irq_desc(irq_resolve_mapping(domain, hwirq));
 }
 EXPORT_SYMBOL_GPL(generic_handle_domain_irq);
 
-#ifdef CONFIG_HANDLE_DOMAIN_IRQ
 /**
- * handle_domain_irq - Invoke the handler for a HW irq belonging to a domain,
- *                     usually for a root interrupt controller
+ * generic_handle_domain_nmi - Invoke the handler for a HW nmi belonging
+ *                             to a domain.
  * @domain:    The domain where to perform the lookup
  * @hwirq:     The HW irq number to convert to a logical one
- * @regs:      Register file coming from the low-level handling code
- *
- *             This function must be called from an IRQ context.
  *
  * Returns:    0 on success, or -EINVAL if conversion has failed
- */
-int handle_domain_irq(struct irq_domain *domain,
-                     unsigned int hwirq, struct pt_regs *regs)
-{
-       struct pt_regs *old_regs = set_irq_regs(regs);
-       int ret;
-
-       /*
-        * IRQ context needs to be setup earlier.
-        */
-       WARN_ON(!in_irq());
-
-       ret = generic_handle_domain_irq(domain, hwirq);
-
-       set_irq_regs(old_regs);
-       return ret;
-}
-
-/**
- * handle_domain_nmi - Invoke the handler for a HW irq belonging to a domain
- * @domain:    The domain where to perform the lookup
- * @hwirq:     The HW irq number to convert to a logical one
- * @regs:      Register file coming from the low-level handling code
- *
- *             This function must be called from an NMI context.
  *
- * Returns:    0 on success, or -EINVAL if conversion has failed
- */
-int handle_domain_nmi(struct irq_domain *domain, unsigned int hwirq,
-                     struct pt_regs *regs)
+ *             This function must be called from an NMI context with irq regs
+ *             initialized.
+ **/
+int generic_handle_domain_nmi(struct irq_domain *domain, unsigned int hwirq)
 {
-       struct pt_regs *old_regs = set_irq_regs(regs);
-       int ret;
-
-       /*
-        * NMI context needs to be setup earlier in order to deal with tracing.
-        */
-       WARN_ON(!in_nmi());
-
-       ret = generic_handle_domain_irq(domain, hwirq);
-
-       set_irq_regs(old_regs);
-       return ret;
+       WARN_ON_ONCE(!in_nmi());
+       return handle_irq_desc(irq_resolve_mapping(domain, hwirq));
 }
 #endif
-#endif
 
 /* Dynamic interrupt handling */