diff options
| author | Wu Fengguang <fengguang.wu@intel.com> | 2009-10-30 11:42:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-10-30 11:42:18 +0100 |
| commit | 70ca35fb42680fc4315d4a01f6c77c9a9962199c (patch) | |
| tree | cf4cb8d76f653d4ecc89fb0ad57611fb2d37bf3c /sound | |
| parent | 7bedb011ef4db93b15049ece8d50b29d6fe6af9d (diff) | |
| download | op-kernel-dev-70ca35fb42680fc4315d4a01f6c77c9a9962199c.zip op-kernel-dev-70ca35fb42680fc4315d4a01f6c77c9a9962199c.tar.gz | |
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>
Diffstat (limited to 'sound')
| -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 02be428..c17feac 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) * 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, }, }; |
