ALSA: remove direct access of dev->bus_id in sound/isa/*

[linux-2.6-omap-h63xx.git] / sound / isa / gus / gusextreme.c

diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c
index da13185eb0a034852117982d7069b108b0004bd8..7ad4c3b41a848092b2c7d4795d3e70aa1ebb0a4a 100644 (file)
--- a/sound/isa/gus/gusextreme.c
+++ b/sound/isa/gus/gusextreme.c
@@ -106,16 +106,14 @@ static int __devinit snd_gusextreme_es1688_create(struct snd_card *card,
        if (irq[n] == SNDRV_AUTO_IRQ) {
                irq[n] = snd_legacy_find_free_irq(possible_irqs);
                if (irq[n] < 0) {
-                       snd_printk(KERN_ERR "%s: unable to find a free IRQ "
-                               "for ES1688\n", dev->bus_id);
+                       dev_err(dev, "unable to find a free IRQ for ES1688\n");
                        return -EBUSY;
                }
        }
        if (dma8[n] == SNDRV_AUTO_DMA) {
                dma8[n] = snd_legacy_find_free_dma(possible_dmas);
                if (dma8[n] < 0) {
-                       snd_printk(KERN_ERR "%s: unable to find a free DMA "
-                               "for ES1688\n", dev->bus_id);
+                       dev_err(dev, "unable to find a free DMA for ES1688\n");
                        return -EBUSY;
                }
        }
@@ -143,16 +141,14 @@ static int __devinit snd_gusextreme_gus_card_create(struct snd_card *card,
        if (gf1_irq[n] == SNDRV_AUTO_IRQ) {
                gf1_irq[n] = snd_legacy_find_free_irq(possible_irqs);
                if (gf1_irq[n] < 0) {
-                       snd_printk(KERN_ERR "%s: unable to find a free IRQ "
-                               "for GF1\n", dev->bus_id);
+                       dev_err(dev, "unable to find a free IRQ for GF1\n");
                        return -EBUSY;
                }
        }
        if (dma1[n] == SNDRV_AUTO_DMA) {
                dma1[n] = snd_legacy_find_free_dma(possible_dmas);
                if (dma1[n] < 0) {
-                       snd_printk(KERN_ERR "%s: unable to find a free DMA "
-                               "for GF1\n", dev->bus_id);
+                       dev_err(dev, "unable to find a free DMA for GF1\n");
                        return -EBUSY;
                }
        }
@@ -278,8 +274,8 @@ static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n)
 
        error = -ENODEV;
        if (!gus->ess_flag) {
-               snd_printk(KERN_ERR "%s: GUS Extreme soundcard was not "
-                       "detected at 0x%lx\n", dev->bus_id, gus->gf1.port);
+               dev_err(dev, "GUS Extreme soundcard was not "
+                       "detected at 0x%lx\n", gus->gf1.port);
                goto out;
        }
        gus->codec_flag = 1;
@@ -310,8 +306,7 @@ static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n)
 
        if (snd_opl3_create(card, es1688->port, es1688->port + 2,
                        OPL3_HW_OPL3, 0, &opl3) < 0)
-               printk(KERN_ERR "%s: opl3 not detected at 0x%lx\n",
-                       dev->bus_id, es1688->port);
+               dev_warn(dev, "opl3 not detected at 0x%lx\n", es1688->port);
        else {
                error = snd_opl3_hwdep_new(opl3, 0, 2, NULL);
                if (error < 0)