aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-05-08 02:08:39 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-05-08 19:41:28 -0400
commit96a496fd49fb2c3178128237ae4691b7c7df3a3d (patch)
treeee15639d473df427bdf4fdfdd9fdaec025e040e1 /arch/sparc64
parent34768bc8329194b14e42ee408a84edfa40059046 (diff)
[SPARC64] SBUS: Error interrupt registry cleanups.
Do not use IRQF_SHARED, these interrupt numbers should all be unique. Also use name strings without spaces in them just like PCI controller drivers do, for consistency. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/kernel/sbus.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c
index 3b05428cc909..91f6e2a74ad5 100644
--- a/arch/sparc64/kernel/sbus.c
+++ b/arch/sparc64/kernel/sbus.c
@@ -1002,24 +1002,24 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)
1002 u64 control; 1002 u64 control;
1003 1003
1004 irq = sbus_build_irq(sbus, SYSIO_UE_INO); 1004 irq = sbus_build_irq(sbus, SYSIO_UE_INO);
1005 if (request_irq(irq, sysio_ue_handler, 1005 if (request_irq(irq, sysio_ue_handler, 0,
1006 IRQF_SHARED, "SYSIO UE", sbus) < 0) { 1006 "SYSIO_UE", sbus) < 0) {
1007 prom_printf("SYSIO[%x]: Cannot register UE interrupt.\n", 1007 prom_printf("SYSIO[%x]: Cannot register UE interrupt.\n",
1008 sbus->portid); 1008 sbus->portid);
1009 prom_halt(); 1009 prom_halt();
1010 } 1010 }
1011 1011
1012 irq = sbus_build_irq(sbus, SYSIO_CE_INO); 1012 irq = sbus_build_irq(sbus, SYSIO_CE_INO);
1013 if (request_irq(irq, sysio_ce_handler, 1013 if (request_irq(irq, sysio_ce_handler, 0,
1014 IRQF_SHARED, "SYSIO CE", sbus) < 0) { 1014 "SYSIO_CE", sbus) < 0) {
1015 prom_printf("SYSIO[%x]: Cannot register CE interrupt.\n", 1015 prom_printf("SYSIO[%x]: Cannot register CE interrupt.\n",
1016 sbus->portid); 1016 sbus->portid);
1017 prom_halt(); 1017 prom_halt();
1018 } 1018 }
1019 1019
1020 irq = sbus_build_irq(sbus, SYSIO_SBUSERR_INO); 1020 irq = sbus_build_irq(sbus, SYSIO_SBUSERR_INO);
1021 if (request_irq(irq, sysio_sbus_error_handler, 1021 if (request_irq(irq, sysio_sbus_error_handler, 0,
1022 IRQF_SHARED, "SYSIO SBUS Error", sbus) < 0) { 1022 "SYSIO_SBERR", sbus) < 0) {
1023 prom_printf("SYSIO[%x]: Cannot register SBUS Error interrupt.\n", 1023 prom_printf("SYSIO[%x]: Cannot register SBUS Error interrupt.\n",
1024 sbus->portid); 1024 sbus->portid);
1025 prom_halt(); 1025 prom_halt();