summaryrefslogtreecommitdiff
path: root/sound/x86/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-01-31 15:52:22 +0300
committerTakashi Iwai <tiwai@suse.de>2017-02-03 19:31:35 +0300
commitda8648097497505d05d8cff6892351f99c029791 (patch)
tree4e107ece33e302157501cb7636f66556ee0babe5 /sound/x86/Makefile
parenteeb756c5bf7566fd79312798a32f59e594688b79 (diff)
downloadlinux-da8648097497505d05d8cff6892351f99c029791.tar.xz
ALSA: x86: Flatten two abstraction layers
This is the final stage for a big clean-up series. Here we flatten the two layers into one. Formerly, the implementation was split to HDMI "shell" that talks with the platform device, and HDMI audio part that communicates via caps and other event handlers. All these would be good if there were multiple instantiations or if there were data protection. But neither are true in our case. That said, it'll be easier to have a flat driver structure in the end. In this patch, the former struct hdmi_lpe_audio_ctx is forged into the existing struct snd_intelhad. The latter has already a few members that are basically the copy from the former. Only a few new members for the lowlevel I/O are added by this change. Then, the had_get_caps() and had_set_caps() are simply replaced with the direct calls to copy the data in the struct fields. Also, the had_event_handler() calls are replaced with the direct call for each event as well. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/x86/Makefile')
-rw-r--r--sound/x86/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/x86/Makefile b/sound/x86/Makefile
index 85ea22a2cf28..3c0bf63333e6 100644
--- a/sound/x86/Makefile
+++ b/sound/x86/Makefile
@@ -1,6 +1,5 @@
snd-hdmi-lpe-audio-objs += \
intel_hdmi_audio.o \
- intel_hdmi_audio_if.o \
- intel_hdmi_lpe_audio.o
+ intel_hdmi_audio_if.o
obj-$(CONFIG_HDMI_LPE_AUDIO) += snd-hdmi-lpe-audio.o