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

Commit a9310a0f authored by Cristian Ciocaltea's avatar Cristian Ciocaltea Committed by Greg Kroah-Hartman
Browse files

ALSA: usb-audio: Avoid precedence issues in mixer_quirks macros 



[ Upstream commit fd3ab72e42e9871a9902b945a2bf8bb87b49c718 ]

Fix all macro related issues identified by checkpatch.pl:

  CHECK: Macro argument 'x' may be better as '(x)' to avoid precedence issues

Signed-off-by: default avatarCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250526-dualsense-alsa-jack-v1-3-1a821463b632@collabora.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 04fa6f5e

sound/usb/mixer_quirks.c

+7 −7
Original line number Diff line number Diff line
@@ -1990,15 +1990,15 @@ static int dell_dock_mixer_init(struct usb_mixer_interface *mixer) 
#define SND_RME_CLK_FREQMUL_SHIFT		18

#define SND_RME_CLK_FREQMUL_MASK		0x7

#define SND_RME_CLK_SYSTEM(x) \

	((x >> SND_RME_CLK_SYSTEM_SHIFT) & SND_RME_CLK_SYSTEM_MASK)

	(((x) >> SND_RME_CLK_SYSTEM_SHIFT) & SND_RME_CLK_SYSTEM_MASK)

#define SND_RME_CLK_AES(x) \

	((x >> SND_RME_CLK_AES_SHIFT) & SND_RME_CLK_AES_SPDIF_MASK)

	(((x) >> SND_RME_CLK_AES_SHIFT) & SND_RME_CLK_AES_SPDIF_MASK)

#define SND_RME_CLK_SPDIF(x) \

	((x >> SND_RME_CLK_SPDIF_SHIFT) & SND_RME_CLK_AES_SPDIF_MASK)

	(((x) >> SND_RME_CLK_SPDIF_SHIFT) & SND_RME_CLK_AES_SPDIF_MASK)

#define SND_RME_CLK_SYNC(x) \

	((x >> SND_RME_CLK_SYNC_SHIFT) & SND_RME_CLK_SYNC_MASK)

	(((x) >> SND_RME_CLK_SYNC_SHIFT) & SND_RME_CLK_SYNC_MASK)

#define SND_RME_CLK_FREQMUL(x) \

	((x >> SND_RME_CLK_FREQMUL_SHIFT) & SND_RME_CLK_FREQMUL_MASK)

	(((x) >> SND_RME_CLK_FREQMUL_SHIFT) & SND_RME_CLK_FREQMUL_MASK)

#define SND_RME_CLK_AES_LOCK			0x1

#define SND_RME_CLK_AES_SYNC			0x4

#define SND_RME_CLK_SPDIF_LOCK			0x2
@@ -2007,9 +2007,9 @@ static int dell_dock_mixer_init(struct usb_mixer_interface *mixer) 
#define SND_RME_SPDIF_FORMAT_SHIFT		5

#define SND_RME_BINARY_MASK			0x1

#define SND_RME_SPDIF_IF(x) \

	((x >> SND_RME_SPDIF_IF_SHIFT) & SND_RME_BINARY_MASK)

	(((x) >> SND_RME_SPDIF_IF_SHIFT) & SND_RME_BINARY_MASK)

#define SND_RME_SPDIF_FORMAT(x) \

	((x >> SND_RME_SPDIF_FORMAT_SHIFT) & SND_RME_BINARY_MASK)

	(((x) >> SND_RME_SPDIF_FORMAT_SHIFT) & SND_RME_BINARY_MASK)



static const u32 snd_rme_rate_table[] = {

	32000, 44100, 48000, 50000,