summaryrefslogtreecommitdiff
path: root/sound/x86/intel_hdmi_audio.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-01-31 18:14:15 +0100
committerTakashi Iwai <tiwai@suse.de>2017-02-03 17:34:40 +0100
commit4151ee845ad8230d18ac4a0e0bf1037180c6d2d9 (patch)
tree7160197e65adf8b7c72a9f2019eb5dc3140d10ed /sound/x86/intel_hdmi_audio.h
parent2e52f5e518fb79aca459fcd25c3b8f185aa4bcf7 (diff)
ALSA: x86: Remove _v[12] suffices
Although we dropped the most of the obsoleted *_v1 definitions and codes, some codes still keep the _v1 or _v2 suffices. Now they are ripped off. The only thing to be done carefully here is the definition of control offsets. The original code defines enum hdmi_ctrl_reg_offset_v1 and a few new elements just for v2 on its top. After this cleanup, we remove the old AUD_HDMI_STATUS and AUD_HDMIW_INFOFR definitions and replace with the v2 values. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/x86/intel_hdmi_audio.h')
-rw-r--r--sound/x86/intel_hdmi_audio.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/x86/intel_hdmi_audio.h b/sound/x86/intel_hdmi_audio.h
index 4549c4d9d650..8b85a5668d83 100644
--- a/sound/x86/intel_hdmi_audio.h
+++ b/sound/x86/intel_hdmi_audio.h
@@ -69,7 +69,7 @@
#define LAYOUT0 0
#define LAYOUT1 1
#define SWAP_LFE_CENTER 0x00fac4c8
-#define AUD_CONFIG_CH_MASK_V2 0x70
+#define AUD_CONFIG_CH_MASK 0x70
struct pcm_stream_info {
int str_id;