aboutsummaryrefslogtreecommitdiffstats
path: root/sound/sparc/amd7930.c
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 /sound/sparc/amd7930.c
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 'sound/sparc/amd7930.c')
-rw-r--r--sound/sparc/amd7930.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index 55493340f467..dfe9bac7fa32 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -977,9 +977,9 @@ static int __init snd_amd7930_create(struct snd_card *card,
977 977
978 if (request_irq(irq_prop->pri, snd_amd7930_interrupt, 978 if (request_irq(irq_prop->pri, snd_amd7930_interrupt,
979 SA_INTERRUPT | SA_SHIRQ, "amd7930", amd)) { 979 SA_INTERRUPT | SA_SHIRQ, "amd7930", amd)) {
980 snd_printk("amd7930-%d: Unable to grab IRQ %s\n", 980 snd_printk("amd7930-%d: Unable to grab IRQ %d\n",
981 dev, 981 dev,
982 __irq_itoa(irq_prop->pri)); 982 irq_prop->pri);
983 snd_amd7930_free(amd); 983 snd_amd7930_free(amd);
984 return -EBUSY; 984 return -EBUSY;
985 } 985 }
@@ -1063,11 +1063,11 @@ static int __init amd7930_attach(int prom_node, struct sbus_dev *sdev)
1063 1063
1064 strcpy(card->driver, "AMD7930"); 1064 strcpy(card->driver, "AMD7930");
1065 strcpy(card->shortname, "Sun AMD7930"); 1065 strcpy(card->shortname, "Sun AMD7930");
1066 sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %s", 1066 sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %d",
1067 card->shortname, 1067 card->shortname,
1068 rp->flags & 0xffL, 1068 rp->flags & 0xffL,
1069 rp->start, 1069 rp->start,
1070 __irq_itoa(irq_prop.pri)); 1070 irq_prop.pri);
1071 1071
1072 if ((err = snd_amd7930_create(card, sdev, rp, reg_prop.reg_size, 1072 if ((err = snd_amd7930_create(card, sdev, rp, reg_prop.reg_size,
1073 &irq_prop, dev, &amd)) < 0) 1073 &irq_prop, dev, &amd)) < 0)