3 files changed, 16 insertions, 17 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,
 
         if (request_irq(irq_prop->pri, snd_amd7930_interrupt,
                         SA_INTERRUPT | SA_SHIRQ, "amd7930", amd)) {
-                snd_printk("amd7930-%d: Unable to grab IRQ %s\n",
+                snd_printk("amd7930-%d: Unable to grab IRQ %d\n",
                            dev,
-                           __irq_itoa(irq_prop->pri));
+                           irq_prop->pri);
                 snd_amd7930_free(amd);
                 return -EBUSY;
         }
@@ -1063,11 +1063,11 @@ static int __init amd7930_attach(int prom_node, struct sbus_dev *sdev)
 
         strcpy(card->driver, "AMD7930");
         strcpy(card->shortname, "Sun AMD7930");
-        sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %s",
+        sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %d",
                 card->shortname,
                 rp->flags & 0xffL,
                 rp->start,
-                __irq_itoa(irq_prop.pri));
+                irq_prop.pri);
 
         if ((err = snd_amd7930_create(card, sdev, rp, reg_prop.reg_size,
                                           &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,
 
         if (request_irq(sdev->irqs[0], snd_cs4231_sbus_interrupt,
                         SA_SHIRQ, "cs4231", chip)) {
-                snd_printdd("cs4231-%d: Unable to grab SBUS IRQ %s\n",
-                           dev,
-                           __irq_itoa(sdev->irqs[0]));
+                snd_printdd("cs4231-%d: Unable to grab SBUS IRQ %d\n",
+                            dev, sdev->irqs[0]);
                 snd_cs4231_sbus_free(chip);
                 return -EBUSY;
         }
@@ -2038,11 +2037,11 @@ static int __init cs4231_sbus_attach(struct sbus_dev *sdev)
         if (err)
                 return err;
 
-        sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %s",
+        sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %d",
                 card->shortname,
                 rp->flags & 0xffL,
                 rp->start,
-                __irq_itoa(sdev->irqs[0]));
+                sdev->irqs[0]);
 
         if ((err = snd_cs4231_sbus_create(card, sdev, dev, &cp)) < 0) {
                 snd_card_free(card);
@@ -2244,10 +2243,10 @@ static int __init cs4231_ebus_attach(struct linux_ebus_device *edev)
         if (err)
                 return err;
 
-        sprintf(card->longname, "%s at 0x%lx, irq %s",
+        sprintf(card->longname, "%s at 0x%lx, irq %d",
                 card->shortname,
                 edev->resource[0].start,
-                __irq_itoa(edev->irqs[0]));
+                edev->irqs[0]);
 
         if ((err = snd_cs4231_ebus_create(card, edev, dev, &chip)) < 0) {
                 snd_card_free(card);
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 2164b7d290c7..5eecdd09a79d 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -92,7 +92,7 @@ MODULE_PARM_DESC(enable, "Enable Sun DBRI soundcard.");
 #define D_USR   (1<<4)
 #define D_DESC  (1<<5)
 
-static int dbri_debug = 0;
+static int dbri_debug;
 module_param(dbri_debug, int, 0644);
 MODULE_PARM_DESC(dbri_debug, "Debug value for Sun DBRI soundcard.");
 
@@ -593,7 +593,7 @@ struct snd_dbri {
 /* Return a pointer to dbri_streaminfo */
 #define DBRI_STREAM(dbri, substream)    &dbri->stream_info[DBRI_STREAMNO(substream)]
 
-static struct snd_dbri *dbri_list = NULL;       /* All DBRI devices */
+static struct snd_dbri *dbri_list;      /* All DBRI devices */
 
 /*
  * Short data pipes transmit LSB first. The CS4215 receives MSB first. Grrr.
@@ -2521,11 +2521,11 @@ void snd_dbri_proc(struct snd_dbri * dbri)
         struct snd_info_entry *entry;
 
         if (! snd_card_proc_new(dbri->card, "regs", &entry))
-                snd_info_set_text_ops(entry, dbri, 1024, dbri_regs_read);
+                snd_info_set_text_ops(entry, dbri, dbri_regs_read);
 
 #ifdef DBRI_DEBUG
         if (! snd_card_proc_new(dbri->card, "debug", &entry)) {
-                snd_info_set_text_ops(entry, dbri, 4096, dbri_debug_read);
+                snd_info_set_text_ops(entry, dbri, dbri_debug_read);
                 entry->mode = S_IFREG | S_IRUGO;        /* Readable only. */
         }
 #endif
@@ -2645,9 +2645,9 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
         strcpy(card->driver, "DBRI");
         strcpy(card->shortname, "Sun DBRI");
         rp = &sdev->resource[0];
-        sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %s",
+        sprintf(card->longname, "%s at 0x%02lx:0x%08lx, irq %d",
                 card->shortname,
-                rp->flags & 0xffL, rp->start, __irq_itoa(irq.pri));
+                rp->flags & 0xffL, rp->start, irq.pri);
 
         if ((err = snd_dbri_create(card, sdev, &irq, dev)) < 0) {
                 snd_card_free(card);