diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:48 -0400 |
commit | d356d7f4f2761b1391ec41404eefe280e4f11f76 (patch) | |
tree | 83504abb7cd82aec3796a799d6d041e4b0c3d326 /arch/sparc64/kernel/pci_schizo.c | |
parent | 6d20819f8050092d40e9c99c55d82c8e26d42599 (diff) |
[PATCH] irq-flags: SPARC64: Use the new IRQF_ constants
Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/sparc64/kernel/pci_schizo.c')
-rw-r--r-- | arch/sparc64/kernel/pci_schizo.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c index 5c6e2a9b91f8..75ade83ecc65 100644 --- a/arch/sparc64/kernel/pci_schizo.c +++ b/arch/sparc64/kernel/pci_schizo.c | |||
@@ -998,32 +998,32 @@ static void tomatillo_register_error_handlers(struct pci_controller_info *p) | |||
998 | pbm = pbm_for_ino(p, SCHIZO_UE_INO); | 998 | pbm = pbm_for_ino(p, SCHIZO_UE_INO); |
999 | op = of_find_device_by_node(pbm->prom_node); | 999 | op = of_find_device_by_node(pbm->prom_node); |
1000 | if (op) | 1000 | if (op) |
1001 | request_irq(op->irqs[1], schizo_ue_intr, SA_SHIRQ, | 1001 | request_irq(op->irqs[1], schizo_ue_intr, IRQF_SHARED, |
1002 | "TOMATILLO_UE", p); | 1002 | "TOMATILLO_UE", p); |
1003 | 1003 | ||
1004 | pbm = pbm_for_ino(p, SCHIZO_CE_INO); | 1004 | pbm = pbm_for_ino(p, SCHIZO_CE_INO); |
1005 | op = of_find_device_by_node(pbm->prom_node); | 1005 | op = of_find_device_by_node(pbm->prom_node); |
1006 | if (op) | 1006 | if (op) |
1007 | request_irq(op->irqs[2], schizo_ce_intr, SA_SHIRQ, | 1007 | request_irq(op->irqs[2], schizo_ce_intr, IRQF_SHARED, |
1008 | "TOMATILLO CE", p); | 1008 | "TOMATILLO CE", p); |
1009 | 1009 | ||
1010 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO); | 1010 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO); |
1011 | op = of_find_device_by_node(pbm->prom_node); | 1011 | op = of_find_device_by_node(pbm->prom_node); |
1012 | if (op) | 1012 | if (op) |
1013 | request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ, | 1013 | request_irq(op->irqs[0], schizo_pcierr_intr, IRQF_SHARED, |
1014 | "TOMATILLO PCIERR-A", pbm); | 1014 | "TOMATILLO PCIERR-A", pbm); |
1015 | 1015 | ||
1016 | 1016 | ||
1017 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO); | 1017 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO); |
1018 | op = of_find_device_by_node(pbm->prom_node); | 1018 | op = of_find_device_by_node(pbm->prom_node); |
1019 | if (op) | 1019 | if (op) |
1020 | request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ, | 1020 | request_irq(op->irqs[0], schizo_pcierr_intr, IRQF_SHARED, |
1021 | "TOMATILLO PCIERR-B", pbm); | 1021 | "TOMATILLO PCIERR-B", pbm); |
1022 | 1022 | ||
1023 | pbm = pbm_for_ino(p, SCHIZO_SERR_INO); | 1023 | pbm = pbm_for_ino(p, SCHIZO_SERR_INO); |
1024 | op = of_find_device_by_node(pbm->prom_node); | 1024 | op = of_find_device_by_node(pbm->prom_node); |
1025 | if (op) | 1025 | if (op) |
1026 | request_irq(op->irqs[3], schizo_safarierr_intr, SA_SHIRQ, | 1026 | request_irq(op->irqs[3], schizo_safarierr_intr, IRQF_SHARED, |
1027 | "TOMATILLO SERR", p); | 1027 | "TOMATILLO SERR", p); |
1028 | 1028 | ||
1029 | /* Enable UE and CE interrupts for controller. */ | 1029 | /* Enable UE and CE interrupts for controller. */ |
@@ -1106,32 +1106,32 @@ static void schizo_register_error_handlers(struct pci_controller_info *p) | |||
1106 | pbm = pbm_for_ino(p, SCHIZO_UE_INO); | 1106 | pbm = pbm_for_ino(p, SCHIZO_UE_INO); |
1107 | op = of_find_device_by_node(pbm->prom_node); | 1107 | op = of_find_device_by_node(pbm->prom_node); |
1108 | if (op) | 1108 | if (op) |
1109 | request_irq(op->irqs[1], schizo_ue_intr, SA_SHIRQ, | 1109 | request_irq(op->irqs[1], schizo_ue_intr, IRQF_SHARED, |
1110 | "SCHIZO_UE", p); | 1110 | "SCHIZO_UE", p); |
1111 | 1111 | ||
1112 | pbm = pbm_for_ino(p, SCHIZO_CE_INO); | 1112 | pbm = pbm_for_ino(p, SCHIZO_CE_INO); |
1113 | op = of_find_device_by_node(pbm->prom_node); | 1113 | op = of_find_device_by_node(pbm->prom_node); |
1114 | if (op) | 1114 | if (op) |
1115 | request_irq(op->irqs[2], schizo_ce_intr, SA_SHIRQ, | 1115 | request_irq(op->irqs[2], schizo_ce_intr, IRQF_SHARED, |
1116 | "SCHIZO CE", p); | 1116 | "SCHIZO CE", p); |
1117 | 1117 | ||
1118 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO); | 1118 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO); |
1119 | op = of_find_device_by_node(pbm->prom_node); | 1119 | op = of_find_device_by_node(pbm->prom_node); |
1120 | if (op) | 1120 | if (op) |
1121 | request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ, | 1121 | request_irq(op->irqs[0], schizo_pcierr_intr, IRQF_SHARED, |
1122 | "SCHIZO PCIERR-A", pbm); | 1122 | "SCHIZO PCIERR-A", pbm); |
1123 | 1123 | ||
1124 | 1124 | ||
1125 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO); | 1125 | pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO); |
1126 | op = of_find_device_by_node(pbm->prom_node); | 1126 | op = of_find_device_by_node(pbm->prom_node); |
1127 | if (op) | 1127 | if (op) |
1128 | request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ, | 1128 | request_irq(op->irqs[0], schizo_pcierr_intr, IRQF_SHARED, |
1129 | "SCHIZO PCIERR-B", pbm); | 1129 | "SCHIZO PCIERR-B", pbm); |
1130 | 1130 | ||
1131 | pbm = pbm_for_ino(p, SCHIZO_SERR_INO); | 1131 | pbm = pbm_for_ino(p, SCHIZO_SERR_INO); |
1132 | op = of_find_device_by_node(pbm->prom_node); | 1132 | op = of_find_device_by_node(pbm->prom_node); |
1133 | if (op) | 1133 | if (op) |
1134 | request_irq(op->irqs[3], schizo_safarierr_intr, SA_SHIRQ, | 1134 | request_irq(op->irqs[3], schizo_safarierr_intr, IRQF_SHARED, |
1135 | "SCHIZO SERR", p); | 1135 | "SCHIZO SERR", p); |
1136 | 1136 | ||
1137 | /* Enable UE and CE interrupts for controller. */ | 1137 | /* Enable UE and CE interrupts for controller. */ |