Skip to content

Commit

Permalink
ia64: Convert to the new irq_* function names
Browse files Browse the repository at this point in the history
Scripted with coccinelle.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Thomas Gleixner committed Mar 29, 2011
1 parent e3d7812 commit 53c909c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions arch/ia64/hp/sim/hpsim_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ hpsim_irq_init (void)
int i;

for_each_active_irq(i) {
struct irq_chip *chip = get_irq_chip(i);
struct irq_chip *chip = irq_get_chip(i);

if (chip == &no_irq_chip)
set_irq_chip(i, &irq_type_hp_sim);
irq_set_chip(i, &irq_type_hp_sim);
}
}
4 changes: 2 additions & 2 deletions arch/ia64/kernel/irq_ia64.c
Original file line number Diff line number Diff line change
Expand Up @@ -631,10 +631,10 @@ ia64_native_register_percpu_irq (ia64_vector vec, struct irqaction *action)
irq = vec;
BUG_ON(bind_irq_vector(irq, vec, CPU_MASK_ALL));
irq_set_status_flags(irq, IRQ_PER_CPU);
set_irq_chip(irq, &irq_type_ia64_lsapic);
irq_set_chip(irq, &irq_type_ia64_lsapic);
if (action)
setup_irq(irq, action);
set_irq_handler(irq, handle_percpu_irq);
irq_set_handler(irq, handle_percpu_irq);
}

void __init
Expand Down
8 changes: 4 additions & 4 deletions arch/ia64/kernel/msi_ia64.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
if (irq < 0)
return irq;

set_irq_msi(irq, desc);
irq_set_msi_desc(irq, desc);
cpus_and(mask, irq_to_domain(irq), cpu_online_map);
dest_phys_id = cpu_physical_id(first_cpu(mask));
vector = irq_to_vector(irq);
Expand All @@ -75,7 +75,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
MSI_DATA_VECTOR(vector);

write_msi_msg(irq, &msg);
set_irq_chip_and_handler(irq, &ia64_msi_chip, handle_edge_irq);
irq_set_chip_and_handler(irq, &ia64_msi_chip, handle_edge_irq);

return 0;
}
Expand Down Expand Up @@ -206,8 +206,8 @@ int arch_setup_dmar_msi(unsigned int irq)
if (ret < 0)
return ret;
dmar_msi_write(irq, &msg);
set_irq_chip_and_handler_name(irq, &dmar_msi_type, handle_edge_irq,
"edge");
irq_set_chip_and_handler_name(irq, &dmar_msi_type, handle_edge_irq,
"edge");
return 0;
}
#endif /* CONFIG_DMAR */
Expand Down
4 changes: 2 additions & 2 deletions arch/ia64/sn/kernel/msi_sn.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ int sn_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *entry)
*/
msg.data = 0x100 + irq;

set_irq_msi(irq, entry);
irq_set_msi_desc(irq, entry);
write_msi_msg(irq, &msg);
set_irq_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq);
irq_set_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq);

return 0;
}
Expand Down

0 comments on commit 53c909c

Please sign in to comment.