diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 06:21:03 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-25 06:27:32 -0500 |
commit | 4e76a8833fac8dc1735aa5be7d1b3c92c65e209e (patch) | |
tree | 69978ef2eca15fcfc79e42e467be616262d1ff89 /sound/pci/hda/patch_sigmatel.c | |
parent | b989d0444bd4999f9130d262b5ab7123d4077df8 (diff) |
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 <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 3bc29c9b2529..f3784808758e 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -296,7 +296,7 @@ static void stac_gpio_set(struct hda_codec *codec, unsigned int mask, | |||
296 | { | 296 | { |
297 | unsigned int gpiostate, gpiomask, gpiodir; | 297 | unsigned int gpiostate, gpiomask, gpiodir; |
298 | 298 | ||
299 | snd_printdd("%s msk %x dir %x gpio %x\n", __func__, mask, dir_mask, data); | 299 | codec_dbg(codec, "%s msk %x dir %x gpio %x\n", __func__, mask, dir_mask, data); |
300 | 300 | ||
301 | gpiostate = snd_hda_codec_read(codec, codec->afg, 0, | 301 | gpiostate = snd_hda_codec_read(codec, codec->afg, 0, |
302 | AC_VERB_GET_GPIO_DATA, 0); | 302 | AC_VERB_GET_GPIO_DATA, 0); |
@@ -359,7 +359,7 @@ static int stac_vrefout_set(struct hda_codec *codec, | |||
359 | { | 359 | { |
360 | int error, pinctl; | 360 | int error, pinctl; |
361 | 361 | ||
362 | snd_printdd("%s, nid %x ctl %x\n", __func__, nid, new_vref); | 362 | codec_dbg(codec, "%s, nid %x ctl %x\n", __func__, nid, new_vref); |
363 | pinctl = snd_hda_codec_read(codec, nid, 0, | 363 | pinctl = snd_hda_codec_read(codec, nid, 0, |
364 | AC_VERB_GET_PIN_WIDGET_CONTROL, 0); | 364 | AC_VERB_GET_PIN_WIDGET_CONTROL, 0); |
365 | 365 | ||
@@ -2086,7 +2086,7 @@ static void stac92hd83xxx_fixup_hp(struct hda_codec *codec, | |||
2086 | } | 2086 | } |
2087 | 2087 | ||
2088 | if (find_mute_led_cfg(codec, spec->default_polarity)) | 2088 | if (find_mute_led_cfg(codec, spec->default_polarity)) |
2089 | snd_printd("mute LED gpio %d polarity %d\n", | 2089 | codec_dbg(codec, "mute LED gpio %d polarity %d\n", |
2090 | spec->gpio_led, | 2090 | spec->gpio_led, |
2091 | spec->gpio_led_polarity); | 2091 | spec->gpio_led_polarity); |
2092 | } | 2092 | } |
@@ -3077,7 +3077,7 @@ static void stac92hd71bxx_fixup_hp(struct hda_codec *codec, | |||
3077 | } | 3077 | } |
3078 | 3078 | ||
3079 | if (find_mute_led_cfg(codec, 1)) | 3079 | if (find_mute_led_cfg(codec, 1)) |
3080 | snd_printd("mute LED gpio %d polarity %d\n", | 3080 | codec_dbg(codec, "mute LED gpio %d polarity %d\n", |
3081 | spec->gpio_led, | 3081 | spec->gpio_led, |
3082 | spec->gpio_led_polarity); | 3082 | spec->gpio_led_polarity); |
3083 | 3083 | ||
@@ -4422,8 +4422,8 @@ static int patch_stac92hd73xx(struct hda_codec *codec) | |||
4422 | 4422 | ||
4423 | num_dacs = snd_hda_get_num_conns(codec, 0x0a) - 1; | 4423 | num_dacs = snd_hda_get_num_conns(codec, 0x0a) - 1; |
4424 | if (num_dacs < 3 || num_dacs > 5) { | 4424 | if (num_dacs < 3 || num_dacs > 5) { |
4425 | printk(KERN_WARNING "hda_codec: Could not determine " | 4425 | codec_warn(codec, |
4426 | "number of channels defaulting to DAC count\n"); | 4426 | "Could not determine number of channels defaulting to DAC count\n"); |
4427 | num_dacs = 5; | 4427 | num_dacs = 5; |
4428 | } | 4428 | } |
4429 | 4429 | ||