From 4e76a8833fac8dc1735aa5be7d1b3c92c65e209e Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 25 Feb 2014 12:21:03 +0100 Subject: ALSA: hda - Replace with standard printk Use dev_err() and co for messages from HD-audio controller and codec drivers. The codec drivers are mostly bound with codec objects, so some helper macros, codec_err(), codec_info(), etc, are provided. They merely wrap the corresponding dev_xxx(). There are a few places still calling snd_printk() and its variants as they are called without the codec or device context. Signed-off-by: Takashi Iwai --- sound/pci/hda/hda_sysfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sound/pci/hda/hda_sysfs.c') diff --git a/sound/pci/hda/hda_sysfs.c b/sound/pci/hda/hda_sysfs.c index da0f51460533..e2079090ca6f 100644 --- a/sound/pci/hda/hda_sysfs.c +++ b/sound/pci/hda/hda_sysfs.c @@ -119,7 +119,7 @@ static int clear_codec(struct hda_codec *codec) err = snd_hda_codec_reset(codec); if (err < 0) { - snd_printk(KERN_ERR "The codec is being used, can't free.\n"); + codec_err(codec, "The codec is being used, can't free.\n"); return err; } snd_hda_sysfs_clear(codec); @@ -131,10 +131,10 @@ static int reconfig_codec(struct hda_codec *codec) int err; snd_hda_power_up(codec); - snd_printk(KERN_INFO "hda-codec: reconfiguring\n"); + codec_info(codec, "hda-codec: reconfiguring\n"); err = snd_hda_codec_reset(codec); if (err < 0) { - snd_printk(KERN_ERR + codec_err(codec, "The codec is being used, can't reconfigure.\n"); goto error; } -- cgit v1.2.3