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/thinkpad_helper.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/thinkpad_helper.c')
-rw-r--r-- | sound/pci/hda/thinkpad_helper.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/hda/thinkpad_helper.c b/sound/pci/hda/thinkpad_helper.c index 8fe3b8c18ed4..6ba0b5517c40 100644 --- a/sound/pci/hda/thinkpad_helper.c +++ b/sound/pci/hda/thinkpad_helper.c | |||
@@ -63,7 +63,8 @@ static void hda_fixup_thinkpad_acpi(struct hda_codec *codec, | |||
63 | if (!led_set_func) | 63 | if (!led_set_func) |
64 | led_set_func = symbol_request(tpacpi_led_set); | 64 | led_set_func = symbol_request(tpacpi_led_set); |
65 | if (!led_set_func) { | 65 | if (!led_set_func) { |
66 | snd_printk(KERN_WARNING "Failed to find thinkpad-acpi symbol tpacpi_led_set\n"); | 66 | codec_warn(codec, |
67 | "Failed to find thinkpad-acpi symbol tpacpi_led_set\n"); | ||
67 | return; | 68 | return; |
68 | } | 69 | } |
69 | 70 | ||
@@ -75,7 +76,8 @@ static void hda_fixup_thinkpad_acpi(struct hda_codec *codec, | |||
75 | } | 76 | } |
76 | if (led_set_func(TPACPI_LED_MICMUTE, false) >= 0) { | 77 | if (led_set_func(TPACPI_LED_MICMUTE, false) >= 0) { |
77 | if (spec->num_adc_nids > 1) | 78 | if (spec->num_adc_nids > 1) |
78 | snd_printdd("Skipping micmute LED control due to several ADCs"); | 79 | codec_dbg(codec, |
80 | "Skipping micmute LED control due to several ADCs"); | ||
79 | else { | 81 | else { |
80 | spec->cap_sync_hook = update_tpacpi_micmute_led; | 82 | spec->cap_sync_hook = update_tpacpi_micmute_led; |
81 | removefunc = false; | 83 | removefunc = false; |