aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2006-06-20 04:21:29 -0400
committerDavid S. Miller <davem@davemloft.net>2006-06-20 04:21:29 -0400
commitc6387a48cf5958e43c201fc27a158c328927531a (patch)
treea6c24951d6c86ac47bd3f0ba198adbfffd03291b /drivers/scsi
parent6a76267f0e52d920e6bb6da75541e6116d7304da (diff)
[SPARC]: Kill __irq_itoa().
This ugly hack was long overdue to die. It was a way to print out Sparc interrupts in a more freindly format, since IRQ numbers were arbitrary opaque 32-bit integers which vectored into PIL levels. These 32-bit integers were not necessarily in the 0-->NR_IRQS range, but the PILs they vectored to were. The idea now is that we will increase NR_IRQS a little bit and use a virtual<-->real IRQ number mapping scheme similar to PowerPC. That makes this IRQ printing hack irrelevant, and furthermore only a handful of drivers actually used __irq_itoa() making it even less useful. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/esp.c4
-rw-r--r--drivers/scsi/qlogicpti.c6
-rw-r--r--drivers/scsi/sym53c8xx_2/sym_glue.c6
3 files changed, 5 insertions, 11 deletions
diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c
index 87a8c3d2072c..0a3e45d7a972 100644
--- a/drivers/scsi/esp.c
+++ b/drivers/scsi/esp.c
@@ -821,8 +821,8 @@ static int __init esp_register_irq(struct esp *esp)
821 return -1; 821 return -1;
822 } 822 }
823 823
824 printk("esp%d: IRQ %s ", esp->esp_id, 824 printk("esp%d: IRQ %d ", esp->esp_id,
825 __irq_itoa(esp->ehost->irq)); 825 esp->ehost->irq);
826 826
827 return 0; 827 return 0;
828} 828}
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index c7e78dcf09df..7c27ecc6fb5d 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -725,7 +725,7 @@ static int __init qpti_register_irq(struct qlogicpti *qpti)
725 SA_SHIRQ, "Qlogic/PTI", qpti)) 725 SA_SHIRQ, "Qlogic/PTI", qpti))
726 goto fail; 726 goto fail;
727 727
728 printk("qpti%d: IRQ %s ", qpti->qpti_id, __irq_itoa(qpti->irq)); 728 printk("qpti%d: IRQ %d ", qpti->qpti_id, qpti->irq);
729 729
730 return 0; 730 return 0;
731 731
@@ -988,8 +988,8 @@ const char *qlogicpti_info(struct Scsi_Host *host)
988 static char buf[80]; 988 static char buf[80];
989 struct qlogicpti *qpti = (struct qlogicpti *) host->hostdata; 989 struct qlogicpti *qpti = (struct qlogicpti *) host->hostdata;
990 990
991 sprintf(buf, "PTI Qlogic,ISP SBUS SCSI irq %s regs at %p", 991 sprintf(buf, "PTI Qlogic,ISP SBUS SCSI irq %d regs at %p",
992 __irq_itoa(qpti->qhost->irq), qpti->qregs); 992 qpti->qhost->irq, qpti->qregs);
993 return buf; 993 return buf;
994} 994}
995 995
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index 9c83b4d39a26..7677fba2ceb5 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -54,14 +54,8 @@
54#define NAME53C "sym53c" 54#define NAME53C "sym53c"
55#define NAME53C8XX "sym53c8xx" 55#define NAME53C8XX "sym53c8xx"
56 56
57/* SPARC just has to be different ... */
58#ifdef __sparc__
59#define IRQ_FMT "%s"
60#define IRQ_PRM(x) __irq_itoa(x)
61#else
62#define IRQ_FMT "%d" 57#define IRQ_FMT "%d"
63#define IRQ_PRM(x) (x) 58#define IRQ_PRM(x) (x)
64#endif
65 59
66struct sym_driver_setup sym_driver_setup = SYM_LINUX_DRIVER_SETUP; 60struct sym_driver_setup sym_driver_setup = SYM_LINUX_DRIVER_SETUP;
67unsigned int sym_debug_flags = 0; 61unsigned int sym_debug_flags = 0;