diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2015-09-14 22:42:42 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-09-16 15:40:27 -0400 |
commit | 544637bf3f4ddc1971740026e1cf58d8516b53fa (patch) | |
tree | b4aed5cce61951cd0b0a3911d7bdbcab35d7bd55 | |
parent | 171a0138ab75fcbe1228c4af0442221efccfb197 (diff) |
ASoC: ak4642: exchange macro name to avoid redefinition
71a0138ab("ASoC: ak4642: enable to use MCKO as fixed rate output
pin on DT") added new FS() macro, but x86 already has it in
arch/x86/include/uapi/asm/ptrace-abi.h
This patch exchange FS() to FSs() to avoid redefinition warning
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/ak4642.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index b5c4981c9f4c..cda27c22812a 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c | |||
@@ -130,8 +130,8 @@ | |||
130 | #define I2S (3 << 0) | 130 | #define I2S (3 << 0) |
131 | 131 | ||
132 | /* MD_CTL2 */ | 132 | /* MD_CTL2 */ |
133 | #define FS(val) (((val & 0x7) << 0) | ((val & 0x8) << 2)) | 133 | #define FSs(val) (((val & 0x7) << 0) | ((val & 0x8) << 2)) |
134 | #define PS(val) ((val & 0x3) << 6) | 134 | #define PSs(val) ((val & 0x3) << 6) |
135 | 135 | ||
136 | /* MD_CTL3 */ | 136 | /* MD_CTL3 */ |
137 | #define BST1 (1 << 3) | 137 | #define BST1 (1 << 3) |
@@ -458,7 +458,8 @@ static int ak4642_set_mcko(struct snd_soc_codec *codec, | |||
458 | for (ps = 0; ps < ARRAY_SIZE(ps_list); ps++) { | 458 | for (ps = 0; ps < ARRAY_SIZE(ps_list); ps++) { |
459 | for (fs = 0; fs < ARRAY_SIZE(fs_list); fs++) { | 459 | for (fs = 0; fs < ARRAY_SIZE(fs_list); fs++) { |
460 | if (frequency == ps_list[ps] * fs_list[fs]) { | 460 | if (frequency == ps_list[ps] * fs_list[fs]) { |
461 | snd_soc_write(codec, MD_CTL2, PS(ps) | FS(fs)); | 461 | snd_soc_write(codec, MD_CTL2, |
462 | PSs(ps) | FSs(fs)); | ||
462 | return 0; | 463 | return 0; |
463 | } | 464 | } |
464 | } | 465 | } |