diff options
author | David S. Miller <davem@davemloft.net> | 2006-06-20 04:21:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-06-20 04:21:29 -0400 |
commit | c6387a48cf5958e43c201fc27a158c328927531a (patch) | |
tree | a6c24951d6c86ac47bd3f0ba198adbfffd03291b /drivers/ieee1394 | |
parent | 6a76267f0e52d920e6bb6da75541e6116d7304da (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/ieee1394')
-rw-r--r-- | drivers/ieee1394/ohci1394.c | 4 | ||||
-rw-r--r-- | drivers/ieee1394/pcilynx.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 11f13778f139..c031650a1c74 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c | |||
@@ -586,11 +586,7 @@ static void ohci_initialize(struct ti_ohci *ohci) | |||
586 | reg_write(ohci, OHCI1394_HCControlSet, OHCI1394_HCControl_linkEnable); | 586 | reg_write(ohci, OHCI1394_HCControlSet, OHCI1394_HCControl_linkEnable); |
587 | 587 | ||
588 | buf = reg_read(ohci, OHCI1394_Version); | 588 | buf = reg_read(ohci, OHCI1394_Version); |
589 | #ifndef __sparc__ | ||
590 | sprintf (irq_buf, "%d", ohci->dev->irq); | 589 | sprintf (irq_buf, "%d", ohci->dev->irq); |
591 | #else | ||
592 | sprintf (irq_buf, "%s", __irq_itoa(ohci->dev->irq)); | ||
593 | #endif | ||
594 | PRINT(KERN_INFO, "OHCI-1394 %d.%d (PCI): IRQ=[%s] " | 590 | PRINT(KERN_INFO, "OHCI-1394 %d.%d (PCI): IRQ=[%s] " |
595 | "MMIO=[%lx-%lx] Max Packet=[%d] IR/IT contexts=[%d/%d]", | 591 | "MMIO=[%lx-%lx] Max Packet=[%d] IR/IT contexts=[%d/%d]", |
596 | ((((buf) >> 16) & 0xf) + (((buf) >> 20) & 0xf) * 10), | 592 | ((((buf) >> 16) & 0xf) + (((buf) >> 20) & 0xf) * 10), |
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c index e2edc41e1b6f..e29dfd280bee 100644 --- a/drivers/ieee1394/pcilynx.c +++ b/drivers/ieee1394/pcilynx.c | |||
@@ -1252,11 +1252,7 @@ static int __devinit add_card(struct pci_dev *dev, | |||
1252 | /* Fix buggy cards with autoboot pin not tied low: */ | 1252 | /* Fix buggy cards with autoboot pin not tied low: */ |
1253 | reg_write(lynx, DMA0_CHAN_CTRL, 0); | 1253 | reg_write(lynx, DMA0_CHAN_CTRL, 0); |
1254 | 1254 | ||
1255 | #ifndef __sparc__ | ||
1256 | sprintf (irq_buf, "%d", dev->irq); | 1255 | sprintf (irq_buf, "%d", dev->irq); |
1257 | #else | ||
1258 | sprintf (irq_buf, "%s", __irq_itoa(dev->irq)); | ||
1259 | #endif | ||
1260 | 1256 | ||
1261 | if (!request_irq(dev->irq, lynx_irq_handler, SA_SHIRQ, | 1257 | if (!request_irq(dev->irq, lynx_irq_handler, SA_SHIRQ, |
1262 | PCILYNX_DRIVER_NAME, lynx)) { | 1258 | PCILYNX_DRIVER_NAME, lynx)) { |