Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Kuninori Morimoto and committed by
Mark Brown
544637bf 171a0138

+4 -3
+4 -3
sound/soc/codecs/ak4642.c
··· 130 130 #define I2S (3 << 0) 131 131 132 132 /* MD_CTL2 */ 133 - #define FS(val) (((val & 0x7) << 0) | ((val & 0x8) << 2)) 134 - #define PS(val) ((val & 0x3) << 6) 133 + #define FSs(val) (((val & 0x7) << 0) | ((val & 0x8) << 2)) 134 + #define PSs(val) ((val & 0x3) << 6) 135 135 136 136 /* MD_CTL3 */ 137 137 #define BST1 (1 << 3) ··· 458 458 for (ps = 0; ps < ARRAY_SIZE(ps_list); ps++) { 459 459 for (fs = 0; fs < ARRAY_SIZE(fs_list); fs++) { 460 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 463 return 0; 463 464 } 464 465 }