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

Commit 873ce8ad authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Drop bus->avoid_link_reset flag 



Use bus->power_keep_link_on instead.  The controller shouldn't go to
D3 when the link isn't reset, so essentially avoiding the link reset
means avoiding the runtime PM.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9ad54547

sound/pci/hda/hda_codec.h

+0 −1
Original line number Diff line number Diff line
@@ -698,7 +698,6 @@ struct hda_bus { 
	unsigned int in_reset:1;	/* during reset operation */

	unsigned int power_keep_link_on:1; /* don't power off HDA link */

	unsigned int no_response_fallback:1; /* don't fallback at RIRB error */

	unsigned int avoid_link_reset:1; /* don't reset link at runtime PM */



	int primary_dig_out_type;	/* primary digital out PCM type */

};

sound/pci/hda/hda_intel.c

+1 −2
Original line number Diff line number Diff line
@@ -2994,7 +2994,6 @@ static int azx_runtime_suspend(struct device *dev) 
		  STATESTS_INT_MASK);



	azx_stop_chip(chip);

	if (!chip->bus->avoid_link_reset)

	azx_enter_link_reset(chip);

	azx_clear_irq_pending(chip);

	if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)

sound/pci/hda/patch_sigmatel.c

+2 −1
Original line number Diff line number Diff line
@@ -2094,7 +2094,8 @@ static void stac92hd83xxx_fixup_hp_mic_led(struct hda_codec *codec, 


	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		spec->mic_mute_led_gpio = 0x08; /* GPIO3 */

		codec->bus->avoid_link_reset = 1;

		/* resetting controller clears GPIO, so we need to keep on */

		codec->bus->power_keep_link_on = 1;

	}

}