| From: Takashi Sakamoto <o-takashi@sakamocchi.jp> |
| Date: Wed, 2 May 2018 22:48:16 +0900 |
| Subject: ALSA: hda/ca0132: fix build failure when a local macro is defined |
| |
| commit 8e142e9e628975b0dddd05cf1b095331dff6e2de upstream. |
| |
| 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 46e860f76804 ("ALSA: rename |
| TLV-related macros so that they're friendly to user applications") |
| |
| Reported-by: Connor McAdams <conmanx360@gmail.com> |
| Fixes: 44f0c9782cc6 ('ALSA: hda/ca0132: Add tuning controls') |
| Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| sound/pci/hda/patch_ca0132.c | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| --- a/sound/pci/hda/patch_ca0132.c |
| +++ b/sound/pci/hda/patch_ca0132.c |
| @@ -38,6 +38,10 @@ |
| /* Enable this to see controls for tuning purpose. */ |
| /*#define ENABLE_TUNING_CONTROLS*/ |
| |
| +#ifdef ENABLE_TUNING_CONTROLS |
| +#include <sound/tlv.h> |
| +#endif |
| + |
| #define FLOAT_ZERO 0x00000000 |
| #define FLOAT_ONE 0x3f800000 |
| #define FLOAT_TWO 0x40000000 |
| @@ -3037,8 +3041,8 @@ static int equalizer_ctl_put(struct snd_ |
| return 1; |
| } |
| |
| -static const DECLARE_TLV_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(voice_focus_db_scale, 2000, 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, |
| hda_nid_t pnid, hda_nid_t nid, |
