Skip to content

Commit

Permalink
ALSA: hda - Drop bus->avoid_link_reset flag
Browse files Browse the repository at this point in the history
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: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Nov 26, 2013
1 parent 9ad5454 commit 873ce8a
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion sound/pci/hda/hda_codec.h
Original file line number Diff line number Diff line change
@@ -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 */
};
3 changes: 1 addition & 2 deletions sound/pci/hda/hda_intel.c
Original file line number Diff line number Diff line change
@@ -2994,8 +2994,7 @@ 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_enter_link_reset(chip);
azx_clear_irq_pending(chip);
if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
hda_display_power(false);
3 changes: 2 additions & 1 deletion sound/pci/hda/patch_sigmatel.c
Original file line number Diff line number Diff line change
@@ -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;
}
}

0 comments on commit 873ce8a

Please sign in to comment.