aboutsummaryrefslogtreecommitdiff
path: root/sound/isa/es1688/es1688.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-07 09:06:05 +0100
committerTakashi Iwai <tiwai@suse.de>2008-11-07 09:06:05 +0100
commit63cf123bf5d538a066e4a899390c9ce56ab6df9f (patch)
tree00a5e6eabcfdd310247018188f8ebe35b8b6f1ba /sound/isa/es1688/es1688.c
parent6834d7ce224a6f6a1dd05da3a867730c40943154 (diff)
parentfcef7836a31c6432b41a38867d413ed3d6aa8261 (diff)
Merge branch 'topic/fix/misc' into topic/misc
Diffstat (limited to 'sound/isa/es1688/es1688.c')
-rw-r--r--sound/isa/es1688/es1688.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index f88639ea64b..b46377139cf 100644
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -88,16 +88,14 @@ static int __devinit snd_es1688_legacy_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\n",
- dev->bus_id);
+ dev_err(dev, "unable to find a free IRQ\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\n",
- dev->bus_id);
+ dev_err(dev, "unable to find a free DMA\n");
return -EBUSY;
}
}
@@ -147,8 +145,7 @@ static int __devinit snd_es1688_probe(struct device *dev, unsigned int n)
if (snd_opl3_create(card, chip->port, chip->port + 2,
OPL3_HW_OPL3, 0, &opl3) < 0)
- printk(KERN_WARNING "%s: opl3 not detected at 0x%lx\n",
- dev->bus_id, chip->port);
+ dev_warn(dev, "opl3 not detected at 0x%lx\n", chip->port);
else {
error = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
if (error < 0)