Commit 8e142e9e authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai

ALSA: hda/ca0132: fix build failure when a local macro is defined

DECLARE_TLV_DB_SCALE (alias of SNDRV_CTL_TLVD_DECLARE_DB_SCALE) is used but
tlv.h is not included. This causes build failure when local macro is
defined by comment-out.

This commit fixes the bug. At the same time, the alias macro is replaced
with a destination macro added at a commit 46e860f7 ("ALSA: rename
TLV-related macros so that they're friendly to user applications")
Reported-by: default avatarConnor McAdams <conmanx360@gmail.com>
Fixes: 44f0c978 ('ALSA: hda/ca0132: Add tuning controls')
Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f4a414aa
...@@ -39,6 +39,10 @@ ...@@ -39,6 +39,10 @@
/* Enable this to see controls for tuning purpose. */ /* Enable this to see controls for tuning purpose. */
/*#define ENABLE_TUNING_CONTROLS*/ /*#define ENABLE_TUNING_CONTROLS*/
#ifdef ENABLE_TUNING_CONTROLS
#include <sound/tlv.h>
#endif
#define FLOAT_ZERO 0x00000000 #define FLOAT_ZERO 0x00000000
#define FLOAT_ONE 0x3f800000 #define FLOAT_ONE 0x3f800000
#define FLOAT_TWO 0x40000000 #define FLOAT_TWO 0x40000000
...@@ -3068,8 +3072,8 @@ static int equalizer_ctl_put(struct snd_kcontrol *kcontrol, ...@@ -3068,8 +3072,8 @@ static int equalizer_ctl_put(struct snd_kcontrol *kcontrol,
return 1; return 1;
} }
static const DECLARE_TLV_DB_SCALE(voice_focus_db_scale, 2000, 100, 0); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(voice_focus_db_scale, 2000, 100, 0);
static const DECLARE_TLV_DB_SCALE(eq_db_scale, -2400, 100, 0); static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(eq_db_scale, -2400, 100, 0);
static int add_tuning_control(struct hda_codec *codec, static int add_tuning_control(struct hda_codec *codec,
hda_nid_t pnid, hda_nid_t nid, hda_nid_t pnid, hda_nid_t nid,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment