diff mbox

ASoC: ak4642: exchange macro name to avoid redefinition

Message ID 87613c4day.wl%kuninori.morimoto.gx@renesas.com (mailing list archive)
State Accepted
Commit 544637bf3f4ddc1971740026e1cf58d8516b53fa
Headers show

Commit Message

Kuninori Morimoto Sept. 15, 2015, 2:42 a.m. UTC 
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

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>
---
 sound/soc/codecs/ak4642.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index b5c4981..cda27c2 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -130,8 +130,8 @@ 
 #define I2S		(3 << 0)
 
 /* MD_CTL2 */
-#define FS(val)		(((val & 0x7) << 0) | ((val & 0x8) << 2))
-#define PS(val)		((val & 0x3) << 6)
+#define FSs(val)	(((val & 0x7) << 0) | ((val & 0x8) << 2))
+#define PSs(val)	((val & 0x3) << 6)
 
 /* MD_CTL3 */
 #define BST1		(1 << 3)
@@ -458,7 +458,8 @@  static int ak4642_set_mcko(struct snd_soc_codec *codec,
 	for (ps = 0; ps < ARRAY_SIZE(ps_list); ps++) {
 		for (fs = 0; fs < ARRAY_SIZE(fs_list); fs++) {
 			if (frequency == ps_list[ps] * fs_list[fs]) {
-				snd_soc_write(codec, MD_CTL2, PS(ps) | FS(fs));
+				snd_soc_write(codec, MD_CTL2,
+					      PSs(ps) | FSs(fs));
 				return 0;
 			}
 		}