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 /sound/sparc/cs4231.c | |
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 'sound/sparc/cs4231.c')
-rw-r--r-- | sound/sparc/cs4231.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 8804f26ddb3a..b3efc9aa2916 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
@@ -2003,9 +2003,8 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card, | |||
2003 | 2003 | ||
2004 | if (request_irq(sdev->irqs[0], snd_cs4231_sbus_interrupt, | 2004 | if (request_irq(sdev->irqs[0], snd_cs4231_sbus_interrupt, |
2005 | SA_SHIRQ, "cs4231", chip)) { | 2005 | SA_SHIRQ, "cs4231", chip)) { |
2006 | snd_printdd("cs4231-%d: Unable to grab SBUS IRQ %s\n", | 2006 | snd_printdd("cs4231-%d: Unable to grab SBUS IRQ %d\n", |
2007 | dev, | 2007 | dev, sdev->irqs[0]); |
2008 | __irq_itoa(sdev->irqs[0])); | ||
2009 | snd_cs4231_sbus_free(chip); | 2008 | snd_cs4231_sbus_free(chip); |
2010 | return -EBUSY; | 2009 | return -EBUSY; |
2011 | } | 2010 | } |
@@ -2038,11 +2037,11 @@ static int __init cs4231_sbus_attach(struct sbus_dev *sdev) | |||
2038 | if (err) | 2037 | if (err) |
2039 | return err; | 2038 | return err; |
2040 | 2039 | ||
2041 | sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %s", | 2040 | sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %d", |
2042 | card->shortname, | 2041 | card->shortname, |
2043 | rp->flags & 0xffL, | 2042 | rp->flags & 0xffL, |
2044 | rp->start, | 2043 | rp->start, |
2045 | __irq_itoa(sdev->irqs[0])); | 2044 | sdev->irqs[0]); |
2046 | 2045 | ||
2047 | if ((err = snd_cs4231_sbus_create(card, sdev, dev, &cp)) < 0) { | 2046 | if ((err = snd_cs4231_sbus_create(card, sdev, dev, &cp)) < 0) { |
2048 | snd_card_free(card); | 2047 | snd_card_free(card); |
@@ -2244,10 +2243,10 @@ static int __init cs4231_ebus_attach(struct linux_ebus_device *edev) | |||
2244 | if (err) | 2243 | if (err) |
2245 | return err; | 2244 | return err; |
2246 | 2245 | ||
2247 | sprintf(card->longname, "%s at 0x%lx, irq %s", | 2246 | sprintf(card->longname, "%s at 0x%lx, irq %d", |
2248 | card->shortname, | 2247 | card->shortname, |
2249 | edev->resource[0].start, | 2248 | edev->resource[0].start, |
2250 | __irq_itoa(edev->irqs[0])); | 2249 | edev->irqs[0]); |
2251 | 2250 | ||
2252 | if ((err = snd_cs4231_ebus_create(card, edev, dev, &chip)) < 0) { | 2251 | if ((err = snd_cs4231_ebus_create(card, edev, dev, &chip)) < 0) { |
2253 | snd_card_free(card); | 2252 | snd_card_free(card); |