OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: hda-intel - remove model=hwio , use probe_only=3 instead 

The probe_only module parameter skips the codec initialization, too.
Remove the model=hwio code and use second bit in probe_only to
skip the HDA codec reset procedure.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2010-03-26 11:04:38 +01:00
parent 0bf0e5a6f3
commit 10e77ddac0
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/sound/alsa/HD-Audio.txt
View File

@ -597,6 +597,9 @@ probing, the proc file is available, so you can get the raw codec
information before modified by the driver. Of course, the driver
isn't usable with `probe_only=1`. But you can continue the
configuration via hwdep sysfs file if hda-reconfig option is enabled.
Using `probe_only` mask 2 skips the reset of HDA codecs (use
`probe_only=3` as module option). The hwdep interface can be used
to determine the BIOS codec initialization.
hda-verb

10
sound/pci/hda/hda_codec.c
View File

@ -609,15 +609,11 @@ int /*__devinit*/ snd_hda_bus_new(struct snd_card *card,
}
EXPORT_SYMBOL_HDA(snd_hda_bus_new);
#define is_hwio_config(codec) \
(codec->modelname && !strcmp(codec->modelname, "hwio"))
#ifdef CONFIG_SND_HDA_GENERIC
#define is_generic_config(codec) \
((codec->modelname && !strcmp(codec->modelname, "generic")) || \
is_hwio_config(codec))
(codec->modelname && !strcmp(codec->modelname, "generic"))
#else
#define is_generic_config(codec) \
is_hwio_config(codec)
#define is_generic_config(codec) 0
#endif
#ifdef MODULE
@ -1117,8 +1113,6 @@ int snd_hda_codec_configure(struct hda_codec *codec)
}
if (is_generic_config(codec)) {
if (is_hwio_config(codec))
goto patched;
err = snd_hda_parse_generic_codec(codec);
goto patched;
}

4
sound/pci/hda/hda_intel.c
View File

@ -2577,7 +2577,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
/* initialize chip */
azx_init_pci(chip);
azx_init_chip(chip, model[dev] == NULL || strcmp(model[dev], "hwio"));
azx_init_chip(chip, (probe_only[dev] & 2) == 0);
/* codec detection */
if (!chip->codec_mask) {
@ -2666,7 +2666,7 @@ static int __devinit azx_probe(struct pci_dev *pci,
goto out_free;
}
#endif
if (!probe_only[dev]) {
if ((probe_only[dev] & 1) == 0) {
err = azx_codec_configure(chip);
if (err < 0)
goto out_free;