diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-25 11:45:20 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-29 08:48:12 -0400 |
commit | ec775d0e70eb6b7116406b3441cb8501c2849dd2 (patch) | |
tree | 3c9f5bfb1f5a4cde6754517dccaacd9e91a05cf4 /arch/powerpc/sysdev/xilinx_intc.c | |
parent | 7bfbc1f28311d680e45d7122ecd48dec57703750 (diff) |
powerpc: Convert to new irq_* function names
Scripted with coccinelle.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/powerpc/sysdev/xilinx_intc.c')
-rw-r--r-- | arch/powerpc/sysdev/xilinx_intc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c index c5bb44410762..0a13fc19e287 100644 --- a/arch/powerpc/sysdev/xilinx_intc.c +++ b/arch/powerpc/sysdev/xilinx_intc.c | |||
@@ -164,15 +164,15 @@ static int xilinx_intc_xlate(struct irq_host *h, struct device_node *ct, | |||
164 | static int xilinx_intc_map(struct irq_host *h, unsigned int virq, | 164 | static int xilinx_intc_map(struct irq_host *h, unsigned int virq, |
165 | irq_hw_number_t irq) | 165 | irq_hw_number_t irq) |
166 | { | 166 | { |
167 | set_irq_chip_data(virq, h->host_data); | 167 | irq_set_chip_data(virq, h->host_data); |
168 | 168 | ||
169 | if (xilinx_intc_typetable[irq] == IRQ_TYPE_LEVEL_HIGH || | 169 | if (xilinx_intc_typetable[irq] == IRQ_TYPE_LEVEL_HIGH || |
170 | xilinx_intc_typetable[irq] == IRQ_TYPE_LEVEL_LOW) { | 170 | xilinx_intc_typetable[irq] == IRQ_TYPE_LEVEL_LOW) { |
171 | set_irq_chip_and_handler(virq, &xilinx_intc_level_irqchip, | 171 | irq_set_chip_and_handler(virq, &xilinx_intc_level_irqchip, |
172 | handle_level_irq); | 172 | handle_level_irq); |
173 | } else { | 173 | } else { |
174 | set_irq_chip_and_handler(virq, &xilinx_intc_edge_irqchip, | 174 | irq_set_chip_and_handler(virq, &xilinx_intc_edge_irqchip, |
175 | handle_edge_irq); | 175 | handle_edge_irq); |
176 | } | 176 | } |
177 | return 0; | 177 | return 0; |
178 | } | 178 | } |
@@ -223,7 +223,7 @@ int xilinx_intc_get_irq(void) | |||
223 | */ | 223 | */ |
224 | static void xilinx_i8259_cascade(unsigned int irq, struct irq_desc *desc) | 224 | static void xilinx_i8259_cascade(unsigned int irq, struct irq_desc *desc) |
225 | { | 225 | { |
226 | struct irq_chip *chip = get_irq_desc_chip(desc); | 226 | struct irq_chip *chip = irq_desc_get_chip(desc); |
227 | unsigned int cascade_irq = i8259_irq(); | 227 | unsigned int cascade_irq = i8259_irq(); |
228 | 228 | ||
229 | if (cascade_irq) | 229 | if (cascade_irq) |
@@ -250,7 +250,7 @@ static void __init xilinx_i8259_setup_cascade(void) | |||
250 | } | 250 | } |
251 | 251 | ||
252 | i8259_init(cascade_node, 0); | 252 | i8259_init(cascade_node, 0); |
253 | set_irq_chained_handler(cascade_irq, xilinx_i8259_cascade); | 253 | irq_set_chained_handler(cascade_irq, xilinx_i8259_cascade); |
254 | 254 | ||
255 | /* Program irq 7 (usb/audio), 14/15 (ide) to level sensitive */ | 255 | /* Program irq 7 (usb/audio), 14/15 (ide) to level sensitive */ |
256 | /* This looks like a dirty hack to me --gcl */ | 256 | /* This looks like a dirty hack to me --gcl */ |