Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 544637bf authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 171a0138

sound/soc/codecs/ak4642.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

			}

		}