Merge commit 'v2.6.28-rc6' into x86/debug

1 files changed, 4 insertions, 4 deletions

diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index ddd289120aa8..f019d449e2d6 100644
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
@@ -74,15 +74,15 @@ static int __devinit snd_cs4231_match(struct device *dev, unsigned int n)
                 return 0;
 
         if (port[n] == SNDRV_AUTO_PORT) {
-                snd_printk(KERN_ERR "%s: please specify port\n", dev->bus_id);
+                dev_err(dev, "please specify port\n");
                 return 0;
         }
         if (irq[n] == SNDRV_AUTO_IRQ) {
-                snd_printk(KERN_ERR "%s: please specify irq\n", dev->bus_id);
+                dev_err(dev, "please specify irq\n");
                 return 0;
         }
         if (dma1[n] == SNDRV_AUTO_DMA) {
-                snd_printk(KERN_ERR "%s: please specify dma1\n", dev->bus_id);
+                dev_err(dev, "please specify dma1\n");
                 return 0;
         }
         return 1;
@@ -133,7 +133,7 @@ static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n)
                                         mpu_port[n], 0, mpu_irq[n],
                                         mpu_irq[n] >= 0 ? IRQF_DISABLED : 0,
                                         NULL) < 0)
-                        printk(KERN_WARNING "%s: MPU401 not detected\n", dev->bus_id);
+                        dev_warn(dev, "MPU401 not detected\n");
         }
 
         snd_card_set_dev(card, dev);