| From 2d56b3c73f7c267de99e07a870474915a03abfd9 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 26 May 2025 17:07:42 +0300 |
| Subject: ALSA: usb-audio: Avoid precedence issues in mixer_quirks macros |
| |
| From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> |
| |
| [ 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: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Link: https://patch.msgid.link/20250526-dualsense-alsa-jack-v1-3-1a821463b632@collabora.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/usb/mixer_quirks.c | 14 +++++++------- |
| 1 file changed, 7 insertions(+), 7 deletions(-) |
| |
| diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c |
| index be0b3c8ac705..f2cce15be4e2 100644 |
| --- a/sound/usb/mixer_quirks.c |
| +++ b/sound/usb/mixer_quirks.c |
| @@ -2150,15 +2150,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 |
| @@ -2167,9 +2167,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, |
| -- |
| 2.39.5 |
| |
