From f49480103544e0f2e421d2ba0b13d8400b4611e0 Mon Sep 17 00:00:00 2001 From: Xiaoyu Ye Date: Wed, 15 Jan 2020 14:43:35 -0800 Subject: [PATCH] uapi: sound: remove redundant QGKI config checks Userspace does not have access to QGKI configs, so remove redundant QGKI config checks. Change-Id: I1d5167e482478e63381b7f36c3119558a466e5f7 Signed-off-by: Xiaoyu Ye --- include/uapi/sound/compress_params.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/include/uapi/sound/compress_params.h b/include/uapi/sound/compress_params.h index 7df42df36f2a..ab9bf71b1fd5 100644 --- a/include/uapi/sound/compress_params.h +++ b/include/uapi/sound/compress_params.h @@ -264,20 +264,8 @@ struct snd_enc_wma { __u32 super_block_align; /* WMA Type-specific data */ -#ifdef CONFIG_AUDIO_QGKI - __u32 bits_per_sample; - __u32 channelmask; - __u32 encodeopt; - __u32 encodeopt1; - __u32 encodeopt2; - __u32 avg_bit_rate; -#endif }; -#ifdef CONFIG_AUDIO_QGKI -#define SND_ENC_WMA_EXTENTED_SUPPORT -#endif - /** * struct snd_enc_vorbis * @quality: Sets encoding quality to n, between -1 (low) and 10 (high). @@ -403,6 +391,8 @@ struct snd_dec_wma { __u32 avg_bit_rate; } __attribute__((packed, aligned(4))); +#define SND_DEC_WMA_EXTENTED_SUPPORT + struct snd_dec_aptx { __u32 lap; __u32 uap;