Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49fb1897 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Set stream_pm ops automatically by generic parser 



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: default avatarTakashi Iwai <tiwai@suse.de>
parent 82324502

sound/pci/hda/hda_generic.c

+4 −1
Original line number Diff line number Diff line
@@ -4926,9 +4926,12 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec, 
 dig_only:

	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)

			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) {

		err = snd_hda_attach_beep_device(codec, spec->beep_nid);

sound/pci/hda/patch_realtek.c

+0 −1
Original line number Diff line number Diff line
@@ -5724,7 +5724,6 @@ static int patch_alc269(struct hda_codec *codec) 
		set_beep_amp(spec, spec->gen.mixer_nid, 0x04, HDA_INPUT);



	codec->patch_ops = alc_patch_ops;

	codec->patch_ops.stream_pm = snd_hda_gen_stream_pm;

#ifdef CONFIG_PM

	codec->patch_ops.suspend = alc269_suspend;

	codec->patch_ops.resume = alc269_resume;

sound/pci/hda/patch_sigmatel.c

+0 −1
Original line number Diff line number Diff line
@@ -4403,7 +4403,6 @@ static const struct hda_codec_ops stac_patch_ops = { 
#ifdef CONFIG_PM

	.suspend = stac_suspend,

#endif

	.stream_pm = snd_hda_gen_stream_pm,

	.reboot_notify = stac_shutup,

};

sound/pci/hda/patch_via.c

+0 −1
Original line number Diff line number Diff line
@@ -472,7 +472,6 @@ static const struct hda_codec_ops via_patch_ops = { 
	.init = via_init,

	.free = via_free,

	.unsol_event = snd_hda_jack_unsol_event,

	.stream_pm = snd_hda_gen_stream_pm,

#ifdef CONFIG_PM

	.suspend = via_suspend,

	.check_power_status = via_check_power_status,