diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/sparc/amd7930.c | 8 | ||||
-rw-r--r-- | sound/sparc/cs4231.c | 13 | ||||
-rw-r--r-- | sound/sparc/dbri.c | 4 |
3 files changed, 12 insertions, 13 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) |
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); |
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 2164b7d290c7..e622d08215c9 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
@@ -2645,9 +2645,9 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev) | |||
2645 | strcpy(card->driver, "DBRI"); | 2645 | strcpy(card->driver, "DBRI"); |
2646 | strcpy(card->shortname, "Sun DBRI"); | 2646 | strcpy(card->shortname, "Sun DBRI"); |
2647 | rp = &sdev->resource[0]; | 2647 | rp = &sdev->resource[0]; |
2648 | sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %s", | 2648 | sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %d", |
2649 | card->shortname, | 2649 | card->shortname, |
2650 | rp->flags & 0xffL, rp->start, __irq_itoa(irq.pri)); | 2650 | rp->flags & 0xffL, rp->start, irq.pri); |
2651 | 2651 | ||
2652 | if ((err = snd_dbri_create(card, sdev, &irq, dev)) < 0) { | 2652 | if ((err = snd_dbri_create(card, sdev, &irq, dev)) < 0) { |
2653 | snd_card_free(card); | 2653 | snd_card_free(card); |