Skip to content

Commit 85a8ff1

Browse files
geertuYuryNorov
authored andcommitted
ALSA: usb-audio: #undef field_{get,prep}() before local definition
Prepare for the advent of globally available common field_get() and field_prep() macros by undefining the symbols before defining local variants. This prevents redefinition warnings from the C preprocessor when introducing the common macros later. Suggested-by: Yury Norov <yury.norov@gmail.com> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Yury Norov (NVIDIA) <yury.norov@gmail.com>
1 parent 138ab44 commit 85a8ff1

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

sound/usb/mixer_quirks.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3312,7 +3312,9 @@ static int snd_bbfpro_controls_create(struct usb_mixer_interface *mixer)
33123312
#define RME_DIGIFACE_INVERT BIT(31)
33133313

33143314
/* Nonconst helpers */
3315+
#undef field_get
33153316
#define field_get(_mask, _reg) (((_reg) & (_mask)) >> (ffs(_mask) - 1))
3317+
#undef field_prep
33163318
#define field_prep(_mask, _val) (((_val) << (ffs(_mask) - 1)) & (_mask))
33173319

33183320
static int snd_rme_digiface_write_reg(struct snd_kcontrol *kcontrol, int item, u16 mask, u16 val)

0 commit comments

Comments
 (0)