diff options
Diffstat (limited to 'arch/powerpc/sysdev/xilinx_intc.c')
-rw-r--r-- | arch/powerpc/sysdev/xilinx_intc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c index 0a13fc19e287..6183799754af 100644 --- a/arch/powerpc/sysdev/xilinx_intc.c +++ b/arch/powerpc/sysdev/xilinx_intc.c | |||
@@ -71,7 +71,7 @@ static unsigned char xilinx_intc_map_senses[] = { | |||
71 | */ | 71 | */ |
72 | static void xilinx_intc_mask(struct irq_data *d) | 72 | static void xilinx_intc_mask(struct irq_data *d) |
73 | { | 73 | { |
74 | int irq = virq_to_hw(d->irq); | 74 | int irq = irqd_to_hwirq(d); |
75 | void * regs = irq_data_get_irq_chip_data(d); | 75 | void * regs = irq_data_get_irq_chip_data(d); |
76 | pr_debug("mask: %d\n", irq); | 76 | pr_debug("mask: %d\n", irq); |
77 | out_be32(regs + XINTC_CIE, 1 << irq); | 77 | out_be32(regs + XINTC_CIE, 1 << irq); |
@@ -87,7 +87,7 @@ static int xilinx_intc_set_type(struct irq_data *d, unsigned int flow_type) | |||
87 | */ | 87 | */ |
88 | static void xilinx_intc_level_unmask(struct irq_data *d) | 88 | static void xilinx_intc_level_unmask(struct irq_data *d) |
89 | { | 89 | { |
90 | int irq = virq_to_hw(d->irq); | 90 | int irq = irqd_to_hwirq(d); |
91 | void * regs = irq_data_get_irq_chip_data(d); | 91 | void * regs = irq_data_get_irq_chip_data(d); |
92 | pr_debug("unmask: %d\n", irq); | 92 | pr_debug("unmask: %d\n", irq); |
93 | out_be32(regs + XINTC_SIE, 1 << irq); | 93 | out_be32(regs + XINTC_SIE, 1 << irq); |
@@ -112,7 +112,7 @@ static struct irq_chip xilinx_intc_level_irqchip = { | |||
112 | */ | 112 | */ |
113 | static void xilinx_intc_edge_unmask(struct irq_data *d) | 113 | static void xilinx_intc_edge_unmask(struct irq_data *d) |
114 | { | 114 | { |
115 | int irq = virq_to_hw(d->irq); | 115 | int irq = irqd_to_hwirq(d); |
116 | void *regs = irq_data_get_irq_chip_data(d); | 116 | void *regs = irq_data_get_irq_chip_data(d); |
117 | pr_debug("unmask: %d\n", irq); | 117 | pr_debug("unmask: %d\n", irq); |
118 | out_be32(regs + XINTC_SIE, 1 << irq); | 118 | out_be32(regs + XINTC_SIE, 1 << irq); |
@@ -120,7 +120,7 @@ static void xilinx_intc_edge_unmask(struct irq_data *d) | |||
120 | 120 | ||
121 | static void xilinx_intc_edge_ack(struct irq_data *d) | 121 | static void xilinx_intc_edge_ack(struct irq_data *d) |
122 | { | 122 | { |
123 | int irq = virq_to_hw(d->irq); | 123 | int irq = irqd_to_hwirq(d); |
124 | void * regs = irq_data_get_irq_chip_data(d); | 124 | void * regs = irq_data_get_irq_chip_data(d); |
125 | pr_debug("ack: %d\n", irq); | 125 | pr_debug("ack: %d\n", irq); |
126 | out_be32(regs + XINTC_IAR, 1 << irq); | 126 | out_be32(regs + XINTC_IAR, 1 << irq); |