ucm2: replace ${CardIdByName} substitution with ${find-card}

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/HDA-Intel/HDA-Intel.conf b/ucm2/HDA-Intel/HDA-Intel.conf
index dea99cf9a98ffbdaaaf072dc0237b2a56c750ee0..5794e729d3ff0524132a7c9b1ca85284d6950a84 100644 (file)
--- a/ucm2/HDA-Intel/HDA-Intel.conf
+++ b/ucm2/HDA-Intel/HDA-Intel.conf
@@ -2,7 +2,7 @@ Syntax 3
 
 Define.Use ""  # a non-empty string to use UCM configuration for HDA devices
 
-Define.AcpCardId "$${CardIdByName:acp}"
+Define.AcpCardId "$${find-card:field=name,return=id,regex='^acp$'}"
 
 If.acp {
        Condition {

diff --git a/ucm2/USB-Audio/Gigabyte-Aorus-Master-Main-Audio-HiFi.conf b/ucm2/USB-Audio/Gigabyte-Aorus-Master-Main-Audio-HiFi.conf
index 37800fb35411b11b1be61af9529438da6e3ced6f..593787c88016e31daac476f5b10ac17f9b034555 100644 (file)
--- a/ucm2/USB-Audio/Gigabyte-Aorus-Master-Main-Audio-HiFi.conf
+++ b/ucm2/USB-Audio/Gigabyte-Aorus-Master-Main-Audio-HiFi.conf
@@ -1,4 +1,4 @@
-Define.SecondaryCardId "$${CardIdByName:Aorus Master Front Headphone}"
+Define.SecondaryCardId "$${find-card:field=name,return=id,regex='Aorus Master Front Headphone'"
 
 SectionDevice."Speaker" {
        Comment "Speakers"