Skip to content

L
linux-davinci
Commit 9a11f1aa authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: hda - Reword information messages for BIOS auto-probing mode 

The sentense "Unknown model for xxx, ..." makes people too nervous
and drives them to a direction to a wrong "fix" by giving any
mismatching model option.

Let's rephrase the messages to be more nice and easy (at least that
won't make people suspect conspiracies).
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1ba7a7c6
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 36 deletions
Documentation/sound/alsa/HD-Audio.txt
View file @ 9a11f1aa
...@@ -138,6 +138,10 @@ override the BIOS setup or to provide more comprehensive features. ...@@ -138,6 +138,10 @@ override the BIOS setup or to provide more comprehensive features.
The driver checks PCI SSID and looks through the static configuration The driver checks PCI SSID and looks through the static configuration
table until any matching entry is found. If you have a new machine, table until any matching entry is found. If you have a new machine,
you may see a message like below: you may see a message like below:
------------------------------------------------------------------------
hda_codec: ALC880: BIOS auto-probing.
------------------------------------------------------------------------
Meanwhile, in the earlier versions, you would see a message like:
------------------------------------------------------------------------ ------------------------------------------------------------------------
hda_codec: Unknown model for ALC880, trying auto-probe from BIOS... hda_codec: Unknown model for ALC880, trying auto-probe from BIOS...
------------------------------------------------------------------------ ------------------------------------------------------------------------
......
sound/pci/hda/patch_analog.c
View file @ 9a11f1aa
...@@ -2982,7 +2982,8 @@ static int patch_ad1988(struct hda_codec *codec) ...@@ -2982,7 +2982,8 @@ static int patch_ad1988(struct hda_codec *codec)
board_config = snd_hda_check_board_config(codec, AD1988_MODEL_LAST, board_config = snd_hda_check_board_config(codec, AD1988_MODEL_LAST,
ad1988_models, ad1988_cfg_tbl); ad1988_models, ad1988_cfg_tbl);
if (board_config < 0) { if (board_config < 0) {
printk(KERN_INFO "hda_codec: Unknown model for AD1988, trying auto-probe from BIOS...\n"); printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
codec->chip_name);
board_config = AD1988_AUTO; board_config = AD1988_AUTO;
} }
......
sound/pci/hda/patch_cmedia.c
View file @ 9a11f1aa
...@@ -635,7 +635,8 @@ static int patch_cmi9880(struct hda_codec *codec) ...@@ -635,7 +635,8 @@ static int patch_cmi9880(struct hda_codec *codec)
cmi9880_models, cmi9880_models,
cmi9880_cfg_tbl); cmi9880_cfg_tbl);
if (spec->board_config < 0) { if (spec->board_config < 0) {
snd_printdd(KERN_INFO "hda_codec: Unknown model for CMI9880\n"); snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
codec->chip_name);
spec->board_config = CMI_AUTO; /* try everything */ spec->board_config = CMI_AUTO; /* try everything */
} }
......
sound/pci/hda/patch_realtek.c
View file @ 9a11f1aa
...@@ -4584,8 +4584,8 @@ static int patch_alc880(struct hda_codec *codec) ...@@ -4584,8 +4584,8 @@ static int patch_alc880(struct hda_codec *codec)
alc880_models, alc880_models,
alc880_cfg_tbl); alc880_cfg_tbl);
if (board_config < 0) { if (board_config < 0) {
printk(KERN_INFO "hda_codec: Unknown model for %s, " printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
"trying auto-probe from BIOS...\n", codec->chip_name); codec->chip_name);
board_config = ALC880_AUTO; board_config = ALC880_AUTO;
} }
...@@ -6228,8 +6228,7 @@ static int patch_alc260(struct hda_codec *codec) ...@@ -6228,8 +6228,7 @@ static int patch_alc260(struct hda_codec *codec)
alc260_models, alc260_models,
alc260_cfg_tbl); alc260_cfg_tbl);
if (board_config < 0) { if (board_config < 0) {
snd_printd(KERN_INFO "hda_codec: Unknown model for %s, " snd_printd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
"trying auto-probe from BIOS...\n",
codec->chip_name); codec->chip_name);
board_config = ALC260_AUTO; board_config = ALC260_AUTO;
} }
...@@ -9526,8 +9525,7 @@ static int patch_alc882(struct hda_codec *codec) ...@@ -9526,8 +9525,7 @@ static int patch_alc882(struct hda_codec *codec)
ALC882_MODEL_LAST, alc882_models, alc882_ssid_cfg_tbl); ALC882_MODEL_LAST, alc882_models, alc882_ssid_cfg_tbl);
if (board_config < 0 || board_config >= ALC882_MODEL_LAST) { if (board_config < 0 || board_config >= ALC882_MODEL_LAST) {
printk(KERN_INFO "hda_codec: Unknown model for %s, " printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
"trying auto-probe from BIOS...\n",
codec->chip_name); codec->chip_name);
board_config = ALC882_AUTO; board_config = ALC882_AUTO;
} }
...@@ -11406,8 +11404,8 @@ static int patch_alc262(struct hda_codec *codec) ...@@ -11406,8 +11404,8 @@ static int patch_alc262(struct hda_codec *codec)
alc262_cfg_tbl); alc262_cfg_tbl);
if (board_config < 0) { if (board_config < 0) {
printk(KERN_INFO "hda_codec: Unknown model for %s, " printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
"trying auto-probe from BIOS...\n", codec->chip_name); codec->chip_name);
board_config = ALC262_AUTO; board_config = ALC262_AUTO;
} }
...@@ -12479,8 +12477,8 @@ static int patch_alc268(struct hda_codec *codec) ...@@ -12479,8 +12477,8 @@ static int patch_alc268(struct hda_codec *codec)
alc268_cfg_tbl); alc268_cfg_tbl);
if (board_config < 0 || board_config >= ALC268_MODEL_LAST) { if (board_config < 0 || board_config >= ALC268_MODEL_LAST) {
printk(KERN_INFO "hda_codec: Unknown model for %s, " printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
"trying auto-probe from BIOS...\n", codec->chip_name); codec->chip_name);
board_config = ALC268_AUTO; board_config = ALC268_AUTO;
} }
...@@ -13297,8 +13295,8 @@ static int patch_alc269(struct hda_codec *codec) ...@@ -13297,8 +13295,8 @@ static int patch_alc269(struct hda_codec *codec)
alc269_cfg_tbl); alc269_cfg_tbl);
if (board_config < 0) { if (board_config < 0) {
printk(KERN_INFO "hda_codec: Unknown model for %s, " printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
"trying auto-probe from BIOS...\n", codec->chip_name); codec->chip_name);
board_config = ALC269_AUTO; board_config = ALC269_AUTO;
} }
...@@ -14448,8 +14446,8 @@ static int patch_alc861(struct hda_codec *codec) ...@@ -14448,8 +14446,8 @@ static int patch_alc861(struct hda_codec *codec)
alc861_cfg_tbl); alc861_cfg_tbl);
if (board_config < 0) { if (board_config < 0) {
printk(KERN_INFO "hda_codec: Unknown model for %s, " printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
"trying auto-probe from BIOS...\n", codec->chip_name); codec->chip_name);
board_config = ALC861_AUTO; board_config = ALC861_AUTO;
} }
...@@ -15372,8 +15370,8 @@ static int patch_alc861vd(struct hda_codec *codec) ...@@ -15372,8 +15370,8 @@ static int patch_alc861vd(struct hda_codec *codec)
alc861vd_cfg_tbl); alc861vd_cfg_tbl);
if (board_config < 0 || board_config >= ALC861VD_MODEL_LAST) { if (board_config < 0 || board_config >= ALC861VD_MODEL_LAST) {
printk(KERN_INFO "hda_codec: Unknown model for %s, " printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
"trying auto-probe from BIOS...\n", codec->chip_name); codec->chip_name);
board_config = ALC861VD_AUTO; board_config = ALC861VD_AUTO;
} }
...@@ -17296,8 +17294,8 @@ static int patch_alc662(struct hda_codec *codec) ...@@ -17296,8 +17294,8 @@ static int patch_alc662(struct hda_codec *codec)
alc662_models, alc662_models,
alc662_cfg_tbl); alc662_cfg_tbl);
if (board_config < 0) { if (board_config < 0) {
printk(KERN_INFO "hda_codec: Unknown model for %s, " printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
"trying auto-probe from BIOS...\n", codec->chip_name); codec->chip_name);
board_config = ALC662_AUTO; board_config = ALC662_AUTO;
} }
......
sound/pci/hda/patch_sigmatel.c
View file @ 9a11f1aa
...@@ -4794,7 +4794,8 @@ static int patch_stac9200(struct hda_codec *codec) ...@@ -4794,7 +4794,8 @@ static int patch_stac9200(struct hda_codec *codec)
stac9200_models, stac9200_models,
stac9200_cfg_tbl); stac9200_cfg_tbl);
if (spec->board_config < 0) if (spec->board_config < 0)
snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9200, using BIOS defaults\n"); snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
codec->chip_name);
else else
stac92xx_set_config_regs(codec, stac92xx_set_config_regs(codec,
stac9200_brd_tbl[spec->board_config]); stac9200_brd_tbl[spec->board_config]);
...@@ -4866,8 +4867,8 @@ static int patch_stac925x(struct hda_codec *codec) ...@@ -4866,8 +4867,8 @@ static int patch_stac925x(struct hda_codec *codec)
stac925x_cfg_tbl); stac925x_cfg_tbl);
again: again:
if (spec->board_config < 0) if (spec->board_config < 0)
snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC925x," snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
"using BIOS defaults\n"); codec->chip_name);
else else
stac92xx_set_config_regs(codec, stac92xx_set_config_regs(codec,
stac925x_brd_tbl[spec->board_config]); stac925x_brd_tbl[spec->board_config]);
...@@ -4949,8 +4950,8 @@ static int patch_stac92hd73xx(struct hda_codec *codec) ...@@ -4949,8 +4950,8 @@ static int patch_stac92hd73xx(struct hda_codec *codec)
stac92hd73xx_cfg_tbl); stac92hd73xx_cfg_tbl);
again: again:
if (spec->board_config < 0) if (spec->board_config < 0)
snd_printdd(KERN_INFO "hda_codec: Unknown model for" snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
" STAC92HD73XX, using BIOS defaults\n"); codec->chip_name);
else else
stac92xx_set_config_regs(codec, stac92xx_set_config_regs(codec,
stac92hd73xx_brd_tbl[spec->board_config]); stac92hd73xx_brd_tbl[spec->board_config]);
...@@ -5125,8 +5126,8 @@ static int patch_stac92hd83xxx(struct hda_codec *codec) ...@@ -5125,8 +5126,8 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
stac92hd83xxx_cfg_tbl); stac92hd83xxx_cfg_tbl);
again: again:
if (spec->board_config < 0) if (spec->board_config < 0)
snd_printdd(KERN_INFO "hda_codec: Unknown model for" snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
" STAC92HD83XXX, using BIOS defaults\n"); codec->chip_name);
else else
stac92xx_set_config_regs(codec, stac92xx_set_config_regs(codec,
stac92hd83xxx_brd_tbl[spec->board_config]); stac92hd83xxx_brd_tbl[spec->board_config]);
...@@ -5291,8 +5292,8 @@ static int patch_stac92hd71bxx(struct hda_codec *codec) ...@@ -5291,8 +5292,8 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
stac92hd71bxx_cfg_tbl); stac92hd71bxx_cfg_tbl);
again: again:
if (spec->board_config < 0) if (spec->board_config < 0)
snd_printdd(KERN_INFO "hda_codec: Unknown model for" snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
" STAC92HD71BXX, using BIOS defaults\n"); codec->chip_name);
else else
stac92xx_set_config_regs(codec, stac92xx_set_config_regs(codec,
stac92hd71bxx_brd_tbl[spec->board_config]); stac92hd71bxx_brd_tbl[spec->board_config]);
...@@ -5547,8 +5548,8 @@ static int patch_stac922x(struct hda_codec *codec) ...@@ -5547,8 +5548,8 @@ static int patch_stac922x(struct hda_codec *codec)
again: again:
if (spec->board_config < 0) if (spec->board_config < 0)
snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC922x, " snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
"using BIOS defaults\n"); codec->chip_name);
else else
stac92xx_set_config_regs(codec, stac92xx_set_config_regs(codec,
stac922x_brd_tbl[spec->board_config]); stac922x_brd_tbl[spec->board_config]);
...@@ -5610,8 +5611,8 @@ static int patch_stac927x(struct hda_codec *codec) ...@@ -5610,8 +5611,8 @@ static int patch_stac927x(struct hda_codec *codec)
stac927x_cfg_tbl); stac927x_cfg_tbl);
again: again:
if (spec->board_config < 0) if (spec->board_config < 0)
snd_printdd(KERN_INFO "hda_codec: Unknown model for" snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
"STAC927x, using BIOS defaults\n"); codec->chip_name);
else else
stac92xx_set_config_regs(codec, stac92xx_set_config_regs(codec,
stac927x_brd_tbl[spec->board_config]); stac927x_brd_tbl[spec->board_config]);
...@@ -5738,7 +5739,8 @@ static int patch_stac9205(struct hda_codec *codec) ...@@ -5738,7 +5739,8 @@ static int patch_stac9205(struct hda_codec *codec)
stac9205_cfg_tbl); stac9205_cfg_tbl);
again: again:
if (spec->board_config < 0) if (spec->board_config < 0)
snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9205, using BIOS defaults\n"); snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
codec->chip_name);
else else
stac92xx_set_config_regs(codec, stac92xx_set_config_regs(codec,
stac9205_brd_tbl[spec->board_config]); stac9205_brd_tbl[spec->board_config]);
...@@ -5890,8 +5892,8 @@ static int patch_stac9872(struct hda_codec *codec) ...@@ -5890,8 +5892,8 @@ static int patch_stac9872(struct hda_codec *codec)
stac9872_models, stac9872_models,
stac9872_cfg_tbl); stac9872_cfg_tbl);
if (spec->board_config < 0) if (spec->board_config < 0)
snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC9872, " snd_printdd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
"using BIOS defaults\n"); codec->chip_name);
else else
stac92xx_set_config_regs(codec, stac92xx_set_config_regs(codec,
stac9872_brd_tbl[spec->board_config]); stac9872_brd_tbl[spec->board_config]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment