Now that all users of CONFIG_HANDLE_DOMAIN_IRQ perform the irq entry work themselves, we can remove the legacy CONFIG_HANDLE_DOMAIN_IRQ_IRQENTRY behaviour.
Unified · Split
| @@ -676,31 +676,6 @@ int generic_handle_domain_irq(struct irq_domain *domain, unsigned int hwirq) · 675 unmodified lines | |||
| 676 | EXPORT_SYMBOL_GPL(generic_handle_domain_irq); | 676 | EXPORT_SYMBOL_GPL(generic_handle_domain_irq); |
| 677 | 677 | ||
| 678 | #ifdef CONFIG_HANDLE_DOMAIN_IRQ | 678 | #ifdef CONFIG_HANDLE_DOMAIN_IRQ |
| 679 | #ifdef CONFIG_HANDLE_DOMAIN_IRQ_IRQENTRY | ||
| 680 | /** | ||
| 681 | * handle_domain_irq - Invoke the handler for a HW irq belonging to a domain, | ||
| 682 | * usually for a root interrupt controller | ||
| 683 | * @domain: The domain where to perform the lookup | ||
| 684 | * @hwirq: The HW irq number to convert to a logical one | ||
| 685 | * @regs: Register file coming from the low-level handling code | ||
| 686 | * | ||
| 687 | * Returns: 0 on success, or -EINVAL if conversion has failed | ||
| 688 | */ | ||
| 689 | int handle_domain_irq(struct irq_domain *domain, | ||
| 690 | unsigned int hwirq, struct pt_regs *regs) | ||
| 691 | { | ||
| 692 | struct pt_regs *old_regs = set_irq_regs(regs); | ||
| 693 | int ret; | ||
| 694 | |||
| 695 | irq_enter(); | ||
| 696 | |||
| 697 | ret = generic_handle_domain_irq(domain, hwirq); | ||
| 698 | |||
| 699 | irq_exit(); | ||
| 700 | set_irq_regs(old_regs); | ||
| 701 | return ret; | ||
| 702 | } | ||
| 703 | #else | ||
| 704 | /** | 679 | /** |
| 705 | * handle_domain_irq - Invoke the handler for a HW irq belonging to a domain, | 680 | * handle_domain_irq - Invoke the handler for a HW irq belonging to a domain, |
| 706 | * usually for a root interrupt controller | 681 | * usually for a root interrupt controller |
| @@ -728,7 +703,6 @@ int handle_domain_irq(struct irq_domain *domain, · 21 unmodified lines | |||
| 728 | set_irq_regs(old_regs); | 703 | set_irq_regs(old_regs); |
| 729 | return ret; | 704 | return ret; |
| 730 | } | 705 | } |
| 731 | #endif | ||
| 732 | 706 | ||
| 733 | /** | 707 | /** |
| 734 | * handle_domain_nmi - Invoke the handler for a HW irq belonging to a domain | 708 | * handle_domain_nmi - Invoke the handler for a HW irq belonging to a domain |