diff options
| author | Philip Rakity <prakity@nvidia.com> | 2013-07-09 11:34:15 +0100 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2013-07-15 15:35:01 -0700 |
| commit | b0dac2a657047e3b9eb4dbedd8b584a075a12cb9 (patch) | |
| tree | de28800e31f31c7d0e3a980b3bba8ee10a306c14 /sound | |
| parent | 31cf831b5af5a3312783bb032ee97b5ddcd6db84 (diff) | |
asoc: codecs: rt5639_ioctl: Fix warning messages
Change-Id: I87a039c3f662b8aa99b6fe8340c6769b03427fca
Signed-off-by: Philip Rakity <prakity@nvidia.com>
Reviewed-on: http://git-master/r/246637
Reviewed-by: Vijay Mali <vmali@nvidia.com>
Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com>
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/rt5639_ioctl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/codecs/rt5639_ioctl.c b/sound/soc/codecs/rt5639_ioctl.c index b168756eec51..17feb5081fae 100644 --- a/sound/soc/codecs/rt5639_ioctl.c +++ b/sound/soc/codecs/rt5639_ioctl.c @@ -9,12 +9,13 @@ * published by the Free Software Foundation. */ +#include <linux/module.h> #include <linux/spi/spi.h> #include <sound/soc.h> #include "rt56xx_ioctl.h" #include "rt5639_ioctl.h" #include "rt5639.h" -#if (CONFIG_SND_SOC_RT5642_MODULE | CONFIG_SND_SOC_RT5642) +#if defined(CONFIG_SND_SOC_RT5642_MODULE) || defined(CONFIG_SND_SOC_RT5642) #include "rt5639-dsp.h" #endif @@ -168,7 +169,7 @@ void get_noise_gate(struct snd_soc_codec *codec, int *noise_gate_en, { unsigned int reg = snd_soc_read(codec, RT5639_DRC_AGC_3); - dev_info("get_noise_gate reg=0x%04x\n", reg); + dev_info(codec->dev, "get_noise_gate reg=0x%04x\n", reg); *noise_gate_en = (reg & RT5639_DRC_AGC_NG_MASK) >> RT5639_DRC_AGC_NG_SFT; *noise_gate_hold_en = (reg & RT5639_DRC_AGC_NGH_MASK) >> @@ -447,7 +448,7 @@ int rt5639_ioctl_common(struct snd_hwdep *hw, struct file *file, if (copy_to_user(rt56xx.buf, buf, sizeof(*buf) * rt56xx.number)) goto err; break; -#if (CONFIG_SND_SOC_RT5642_MODULE | CONFIG_SND_SOC_RT5642) +#if defined(CONFIG_SND_SOC_RT5642_MODULE) || defined(CONFIG_SND_SOC_RT5642) case RT_READ_CODEC_DSP_IOCTL: case RT_WRITE_CODEC_DSP_IOCTL: case RT_GET_CODEC_DSP_MODE_IOCTL: |