diff options
author | Wu Fengguang <fengguang.wu@intel.com> | 2009-10-30 06:42:18 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-10-30 06:42:18 -0400 |
commit | 70ca35fb42680fc4315d4a01f6c77c9a9962199c (patch) | |
tree | cf4cb8d76f653d4ecc89fb0ad57611fb2d37bf3c | |
parent | 7bedb011ef4db93b15049ece8d50b29d6fe6af9d (diff) |
ALSA: hda - use pcm prepare/cleanup callbacks for intelhdmi
Remove pcm callbacks open/close in favor of the prepare/cleanup.
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/patch_intelhdmi.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c index 02be428be667..c17feacab754 100644 --- a/sound/pci/hda/patch_intelhdmi.c +++ b/sound/pci/hda/patch_intelhdmi.c | |||
@@ -543,16 +543,9 @@ static void intel_hdmi_unsol_event(struct hda_codec *codec, unsigned int res) | |||
543 | * Callbacks | 543 | * Callbacks |
544 | */ | 544 | */ |
545 | 545 | ||
546 | static int intel_hdmi_playback_pcm_open(struct hda_pcm_stream *hinfo, | 546 | static int intel_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, |
547 | struct hda_codec *codec, | 547 | struct hda_codec *codec, |
548 | struct snd_pcm_substream *substream) | 548 | struct snd_pcm_substream *substream) |
549 | { | ||
550 | return 0; | ||
551 | } | ||
552 | |||
553 | static int intel_hdmi_playback_pcm_close(struct hda_pcm_stream *hinfo, | ||
554 | struct hda_codec *codec, | ||
555 | struct snd_pcm_substream *substream) | ||
556 | { | 549 | { |
557 | struct intel_hdmi_spec *spec = codec->spec; | 550 | struct intel_hdmi_spec *spec = codec->spec; |
558 | 551 | ||
@@ -582,9 +575,8 @@ static struct hda_pcm_stream intel_hdmi_pcm_playback = { | |||
582 | .channels_min = 2, | 575 | .channels_min = 2, |
583 | .channels_max = 8, | 576 | .channels_max = 8, |
584 | .ops = { | 577 | .ops = { |
585 | .open = intel_hdmi_playback_pcm_open, | 578 | .prepare = intel_hdmi_playback_pcm_prepare, |
586 | .close = intel_hdmi_playback_pcm_close, | 579 | .cleanup = intel_hdmi_playback_pcm_cleanup, |
587 | .prepare = intel_hdmi_playback_pcm_prepare | ||
588 | }, | 580 | }, |
589 | }; | 581 | }; |
590 | 582 | ||