alsa-ucm: Remove combination port generation logic

A previous commit makes mapping names depend on the UCM device name.
Since UCM device names are unique, this means a mapping will at most
have one port and thus no combination ports can be generated.

This removes the dead code in the pa_alsa_ucm_add_ports_combination()
function, unrolls the remaining code in its helper functions that it
used, and renames it to pa_alsa_ucm_add_port() to signal that it no
longer generates combinations.

Link: 0789a8fb76
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
[Wim: Apply to acp add_profiles(), acp_card_set_profile(), compat.h]
This commit is contained in:
Alper Nebi Yasak 2023-11-27 23:30:36 +03:00 committed by Wim Taymans
parent 833c86d35b
commit 0fc80db7fe
4 changed files with 52 additions and 107 deletions

View file

@ -47,10 +47,12 @@ typedef void (*pa_free_cb_t)(void *p);
#define PA_LIKELY(x) (__builtin_expect(!!(x),1))
#define PA_UNLIKELY(x) (__builtin_expect(!!(x),0))
#define PA_PRINTF_FUNC(fmt, arg1) __attribute__((format(printf, fmt, arg1)))
#define PA_UNUSED __attribute__ ((unused))
#else
#define PA_LIKELY(x) (x)
#define PA_UNLIKELY(x) (x)
#define PA_PRINTF_FUNC(fmt, arg1)
#define PA_UNUSED
#endif
#define PA_MIN(a,b) \