mirror of
https://github.com/adulau/aha.git
synced 2024-12-29 04:06:22 +00:00
ALSA: hda - reorder intelhdmi prepare/cleanup callbacks
No behavior change. Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
70ca35fb42
commit
ddb8152b05
1 changed files with 12 additions and 12 deletions
|
@ -543,18 +543,6 @@ static void intel_hdmi_unsol_event(struct hda_codec *codec, unsigned int res)
|
||||||
* Callbacks
|
* Callbacks
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static int intel_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
|
|
||||||
struct hda_codec *codec,
|
|
||||||
struct snd_pcm_substream *substream)
|
|
||||||
{
|
|
||||||
struct intel_hdmi_spec *spec = codec->spec;
|
|
||||||
|
|
||||||
hdmi_stop_infoframe_trans(codec, pin_nid);
|
|
||||||
|
|
||||||
snd_hda_codec_cleanup_stream(codec, hinfo->nid);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
|
static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
|
||||||
struct hda_codec *codec,
|
struct hda_codec *codec,
|
||||||
unsigned int stream_tag,
|
unsigned int stream_tag,
|
||||||
|
@ -570,6 +558,18 @@ static int intel_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int intel_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
|
||||||
|
struct hda_codec *codec,
|
||||||
|
struct snd_pcm_substream *substream)
|
||||||
|
{
|
||||||
|
struct intel_hdmi_spec *spec = codec->spec;
|
||||||
|
|
||||||
|
hdmi_stop_infoframe_trans(codec, pin_nid);
|
||||||
|
|
||||||
|
snd_hda_codec_cleanup_stream(codec, hinfo->nid);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static struct hda_pcm_stream intel_hdmi_pcm_playback = {
|
static struct hda_pcm_stream intel_hdmi_pcm_playback = {
|
||||||
.substreams = 1,
|
.substreams = 1,
|
||||||
.channels_min = 2,
|
.channels_min = 2,
|
||||||
|
|
Loading…
Reference in a new issue