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>

diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c
index 02be428be667ec0ad8d31cb1ea9f75e4ece90faf..c17feacab754cf959542b0d673d2a3e11c8cdaae 100644 (file)
--- 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)
  * Callbacks
  */
 
-static int intel_hdmi_playback_pcm_open(struct hda_pcm_stream *hinfo,
-                                       struct hda_codec *codec,
-                                       struct snd_pcm_substream *substream)
-{
-       return 0;
-}
-
-static int intel_hdmi_playback_pcm_close(struct hda_pcm_stream *hinfo,
-                                        struct hda_codec *codec,
-                                        struct snd_pcm_substream *substream)
+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;
 
@@ -582,9 +575,8 @@ static struct hda_pcm_stream intel_hdmi_pcm_playback = {
        .channels_min = 2,
        .channels_max = 8,
        .ops = {
-               .open    = intel_hdmi_playback_pcm_open,
-               .close   = intel_hdmi_playback_pcm_close,
-               .prepare = intel_hdmi_playback_pcm_prepare
+               .prepare = intel_hdmi_playback_pcm_prepare,
+               .cleanup = intel_hdmi_playback_pcm_cleanup,
        },
 };