iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: hda - Set stream_pm ops automatically by generic parser

Browse Source 
This allows user to test power_save_node feature via sysfs or patch
firmware even on the codecs that don't specify it.  It'll also save a
few lines.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-05-27 08:37:19 +02:00
parent 823245026e
commit 49fb189725
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/pci/hda/hda_generic.c
View File

@ -4926,9 +4926,12 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec,
dig_only: dig_only:
parse_digital(codec); parse_digital(codec);
if (spec->power_down_unused || codec->power_save_node) if (spec->power_down_unused || codec->power_save_node) {
if (!codec->power_filter) if (!codec->power_filter)
codec->power_filter = snd_hda_gen_path_power_filter; codec->power_filter = snd_hda_gen_path_power_filter;
if (!codec->patch_ops.stream_pm)
codec->patch_ops.stream_pm = snd_hda_gen_stream_pm;
}
if (!spec->no_analog && spec->beep_nid) { if (!spec->no_analog && spec->beep_nid) {
err = snd_hda_attach_beep_device(codec, spec->beep_nid); err = snd_hda_attach_beep_device(codec, spec->beep_nid);

1
sound/pci/hda/patch_realtek.c
View File

@ -5724,7 +5724,6 @@ static int patch_alc269(struct hda_codec *codec)
set_beep_amp(spec, spec->gen.mixer_nid, 0x04, HDA_INPUT); set_beep_amp(spec, spec->gen.mixer_nid, 0x04, HDA_INPUT);
codec->patch_ops = alc_patch_ops; codec->patch_ops = alc_patch_ops;
codec->patch_ops.stream_pm = snd_hda_gen_stream_pm;
#ifdef CONFIG_PM #ifdef CONFIG_PM
codec->patch_ops.suspend = alc269_suspend; codec->patch_ops.suspend = alc269_suspend;
codec->patch_ops.resume = alc269_resume; codec->patch_ops.resume = alc269_resume;

1
sound/pci/hda/patch_sigmatel.c
View File

@ -4403,7 +4403,6 @@ static const struct hda_codec_ops stac_patch_ops = {
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = stac_suspend, .suspend = stac_suspend,
#endif #endif
.stream_pm = snd_hda_gen_stream_pm,
.reboot_notify = stac_shutup, .reboot_notify = stac_shutup,
}; };

1
sound/pci/hda/patch_via.c
View File

@ -472,7 +472,6 @@ static const struct hda_codec_ops via_patch_ops = {
.init = via_init, .init = via_init,
.free = via_free, .free = via_free,
.unsol_event = snd_hda_jack_unsol_event, .unsol_event = snd_hda_jack_unsol_event,
.stream_pm = snd_hda_gen_stream_pm,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = via_suspend, .suspend = via_suspend,
.check_power_status = via_check_power_status, .check_power_status = via_check_power_status,