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/sbus | |
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/sbus')
-rw-r--r-- | drivers/sbus/char/cpwatchdog.c | 4 | ||||
-rw-r--r-- | drivers/sbus/char/uctrl.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c index fd2cc7782f76..5bf3dd901b65 100644 --- a/drivers/sbus/char/cpwatchdog.c +++ b/drivers/sbus/char/cpwatchdog.c | |||
@@ -304,8 +304,8 @@ static int wd_open(struct inode *inode, struct file *f) | |||
304 | SA_SHIRQ, | 304 | SA_SHIRQ, |
305 | WD_OBPNAME, | 305 | WD_OBPNAME, |
306 | (void *)wd_dev.regs)) { | 306 | (void *)wd_dev.regs)) { |
307 | printk("%s: Cannot register IRQ %s\n", | 307 | printk("%s: Cannot register IRQ %d\n", |
308 | WD_OBPNAME, __irq_itoa(wd_dev.irq)); | 308 | WD_OBPNAME, wd_dev.irq); |
309 | return(-EBUSY); | 309 | return(-EBUSY); |
310 | } | 310 | } |
311 | wd_dev.initialized = 1; | 311 | wd_dev.initialized = 1; |
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c index e2d9a7c85427..575b1f7ed410 100644 --- a/drivers/sbus/char/uctrl.c +++ b/drivers/sbus/char/uctrl.c | |||
@@ -400,7 +400,7 @@ static int __init ts102_uctrl_init(void) | |||
400 | } | 400 | } |
401 | 401 | ||
402 | driver->regs->uctrl_intr = UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK; | 402 | driver->regs->uctrl_intr = UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK; |
403 | printk("uctrl: 0x%x (irq %s)\n", driver->regs, __irq_itoa(driver->irq)); | 403 | printk("uctrl: 0x%x (irq %d)\n", driver->regs, driver->irq); |
404 | uctrl_get_event_status(); | 404 | uctrl_get_event_status(); |
405 | uctrl_get_external_status(); | 405 | uctrl_get_external_status(); |
406 | return 0; | 406 | return 0; |