diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-04-05 08:48:12 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-04-05 08:48:12 +0200 |
| commit | 100c85421b52e41269ada88f7d71a6b8a06c7a11 (patch) | |
| tree | 1e291a2d1b8e68720a15dfd48964357502d03fc9 /include/asm-generic/bitops/ffs.h | |
| parent | c4e51e424e2c772ce1836912a8b0b87cd61bc9d5 (diff) | |
| parent | 90f8917e7a15f6dd508779048bdf00ce119b6ca0 (diff) | |
Merge tag 'asoc-fix-v6.9-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.9
A relatively large set of fixes here, the biggest piece of it is a
series correcting some problems with the delay reporting for Intel SOF
cards but there's a bunch of other things. Everything here is driver
specific except for a fix in the core for an issue with sign extension
handling volume controls.
Diffstat (limited to 'include/asm-generic/bitops/ffs.h')
| -rw-r--r-- | include/asm-generic/bitops/ffs.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-generic/bitops/ffs.h b/include/asm-generic/bitops/ffs.h index 323fd5d6ae26..4c43f242daeb 100644 --- a/include/asm-generic/bitops/ffs.h +++ b/include/asm-generic/bitops/ffs.h @@ -3,14 +3,14 @@ #define _ASM_GENERIC_BITOPS_FFS_H_ /** - * ffs - find first bit set + * generic_ffs - find first bit set * @x: the word to search * * This is defined the same way as * the libc and compiler builtin ffs routines, therefore * differs in spirit from ffz (man ffs). */ -static inline int ffs(int x) +static inline int generic_ffs(int x) { int r = 1; @@ -39,4 +39,8 @@ static inline int ffs(int x) return r; } +#ifndef __HAVE_ARCH_FFS +#define ffs(x) generic_ffs(x) +#endif + #endif /* _ASM_GENERIC_BITOPS_FFS_H_ */ |