aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-25 16:06:09 -0400
committerThomas Gleixner <tglx@linutronix.de>2011-03-29 08:48:05 -0400
commit53c909c96ade613b5b485fadf7c3b833b3fd0bc7 (patch)
treecd8e7f6ff98fef82682ca6d0f49c4b8be64c57d8 /arch
parente3d781227808d12a5d5228028bf01de3e3824f69 (diff)
ia64: Convert to the new irq_* function names
Scripted with coccinelle. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/hp/sim/hpsim_irq.c4
-rw-r--r--arch/ia64/kernel/irq_ia64.c4
-rw-r--r--arch/ia64/kernel/msi_ia64.c8
-rw-r--r--arch/ia64/sn/kernel/msi_sn.c4
4 files changed, 10 insertions, 10 deletions
diff --git a/arch/ia64/hp/sim/hpsim_irq.c b/arch/ia64/hp/sim/hpsim_irq.c
index d7a3c46d7299..4bd9a63260ee 100644
--- a/arch/ia64/hp/sim/hpsim_irq.c
+++ b/arch/ia64/hp/sim/hpsim_irq.c
@@ -43,9 +43,9 @@ hpsim_irq_init (void)
43 int i; 43 int i;
44 44
45 for_each_active_irq(i) { 45 for_each_active_irq(i) {
46 struct irq_chip *chip = get_irq_chip(i); 46 struct irq_chip *chip = irq_get_chip(i);
47 47
48 if (chip == &no_irq_chip) 48 if (chip == &no_irq_chip)
49 set_irq_chip(i, &irq_type_hp_sim); 49 irq_set_chip(i, &irq_type_hp_sim);
50 } 50 }
51} 51}
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index 8adb08b22838..5b704740f160 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -631,10 +631,10 @@ ia64_native_register_percpu_irq (ia64_vector vec, struct irqaction *action)
631 irq = vec; 631 irq = vec;
632 BUG_ON(bind_irq_vector(irq, vec, CPU_MASK_ALL)); 632 BUG_ON(bind_irq_vector(irq, vec, CPU_MASK_ALL));
633 irq_set_status_flags(irq, IRQ_PER_CPU); 633 irq_set_status_flags(irq, IRQ_PER_CPU);
634 set_irq_chip(irq, &irq_type_ia64_lsapic); 634 irq_set_chip(irq, &irq_type_ia64_lsapic);
635 if (action) 635 if (action)
636 setup_irq(irq, action); 636 setup_irq(irq, action);
637 set_irq_handler(irq, handle_percpu_irq); 637 irq_set_handler(irq, handle_percpu_irq);
638} 638}
639 639
640void __init 640void __init
diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c
index 524d5cccbaeb..009df5434a7a 100644
--- a/arch/ia64/kernel/msi_ia64.c
+++ b/arch/ia64/kernel/msi_ia64.c
@@ -56,7 +56,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
56 if (irq < 0) 56 if (irq < 0)
57 return irq; 57 return irq;
58 58
59 set_irq_msi(irq, desc); 59 irq_set_msi_desc(irq, desc);
60 cpus_and(mask, irq_to_domain(irq), cpu_online_map); 60 cpus_and(mask, irq_to_domain(irq), cpu_online_map);
61 dest_phys_id = cpu_physical_id(first_cpu(mask)); 61 dest_phys_id = cpu_physical_id(first_cpu(mask));
62 vector = irq_to_vector(irq); 62 vector = irq_to_vector(irq);
@@ -75,7 +75,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
75 MSI_DATA_VECTOR(vector); 75 MSI_DATA_VECTOR(vector);
76 76
77 write_msi_msg(irq, &msg); 77 write_msi_msg(irq, &msg);
78 set_irq_chip_and_handler(irq, &ia64_msi_chip, handle_edge_irq); 78 irq_set_chip_and_handler(irq, &ia64_msi_chip, handle_edge_irq);
79 79
80 return 0; 80 return 0;
81} 81}
@@ -206,8 +206,8 @@ int arch_setup_dmar_msi(unsigned int irq)
206 if (ret < 0) 206 if (ret < 0)
207 return ret; 207 return ret;
208 dmar_msi_write(irq, &msg); 208 dmar_msi_write(irq, &msg);
209 set_irq_chip_and_handler_name(irq, &dmar_msi_type, handle_edge_irq, 209 irq_set_chip_and_handler_name(irq, &dmar_msi_type, handle_edge_irq,
210 "edge"); 210 "edge");
211 return 0; 211 return 0;
212} 212}
213#endif /* CONFIG_DMAR */ 213#endif /* CONFIG_DMAR */
diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c
index bedb9dd2e31a..2b98b9e088de 100644
--- a/arch/ia64/sn/kernel/msi_sn.c
+++ b/arch/ia64/sn/kernel/msi_sn.c
@@ -144,9 +144,9 @@ int sn_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *entry)
144 */ 144 */
145 msg.data = 0x100 + irq; 145 msg.data = 0x100 + irq;
146 146
147 set_irq_msi(irq, entry); 147 irq_set_msi_desc(irq, entry);
148 write_msi_msg(irq, &msg); 148 write_msi_msg(irq, &msg);
149 set_irq_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq); 149 irq_set_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq);
150 150
151 return 0; 151 return 0;
152} 152}