diff options
Diffstat (limited to 'arch/powerpc/sysdev/ipic.c')
-rw-r--r-- | arch/powerpc/sysdev/ipic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c index 95da897f05a7..9abed3760545 100644 --- a/arch/powerpc/sysdev/ipic.c +++ b/arch/powerpc/sysdev/ipic.c | |||
@@ -672,13 +672,13 @@ static struct irq_chip ipic_edge_irq_chip = { | |||
672 | .irq_set_type = ipic_set_irq_type, | 672 | .irq_set_type = ipic_set_irq_type, |
673 | }; | 673 | }; |
674 | 674 | ||
675 | static int ipic_host_match(struct irq_host *h, struct device_node *node) | 675 | static int ipic_host_match(struct irq_domain *h, struct device_node *node) |
676 | { | 676 | { |
677 | /* Exact match, unless ipic node is NULL */ | 677 | /* Exact match, unless ipic node is NULL */ |
678 | return h->of_node == NULL || h->of_node == node; | 678 | return h->of_node == NULL || h->of_node == node; |
679 | } | 679 | } |
680 | 680 | ||
681 | static int ipic_host_map(struct irq_host *h, unsigned int virq, | 681 | static int ipic_host_map(struct irq_domain *h, unsigned int virq, |
682 | irq_hw_number_t hw) | 682 | irq_hw_number_t hw) |
683 | { | 683 | { |
684 | struct ipic *ipic = h->host_data; | 684 | struct ipic *ipic = h->host_data; |
@@ -692,7 +692,7 @@ static int ipic_host_map(struct irq_host *h, unsigned int virq, | |||
692 | return 0; | 692 | return 0; |
693 | } | 693 | } |
694 | 694 | ||
695 | static int ipic_host_xlate(struct irq_host *h, struct device_node *ct, | 695 | static int ipic_host_xlate(struct irq_domain *h, struct device_node *ct, |
696 | const u32 *intspec, unsigned int intsize, | 696 | const u32 *intspec, unsigned int intsize, |
697 | irq_hw_number_t *out_hwirq, unsigned int *out_flags) | 697 | irq_hw_number_t *out_hwirq, unsigned int *out_flags) |
698 | 698 | ||
@@ -708,7 +708,7 @@ static int ipic_host_xlate(struct irq_host *h, struct device_node *ct, | |||
708 | return 0; | 708 | return 0; |
709 | } | 709 | } |
710 | 710 | ||
711 | static struct irq_host_ops ipic_host_ops = { | 711 | static struct irq_domain_ops ipic_host_ops = { |
712 | .match = ipic_host_match, | 712 | .match = ipic_host_match, |
713 | .map = ipic_host_map, | 713 | .map = ipic_host_map, |
714 | .xlate = ipic_host_xlate, | 714 | .xlate = ipic_host_xlate, |
@@ -728,7 +728,7 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags) | |||
728 | if (ipic == NULL) | 728 | if (ipic == NULL) |
729 | return NULL; | 729 | return NULL; |
730 | 730 | ||
731 | ipic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR, | 731 | ipic->irqhost = irq_alloc_host(node, IRQ_DOMAIN_MAP_LINEAR, |
732 | NR_IPIC_INTS, | 732 | NR_IPIC_INTS, |
733 | &ipic_host_ops, 0); | 733 | &ipic_host_ops, 0); |
734 | if (ipic->irqhost == NULL) { | 734 | if (ipic->irqhost == NULL) { |