uuid: Use new UUID registry pervasively

Strip out all the literall UUID management from existing C code (the API itself still works for any out-of-tree or test code users) and exclusively use the new, much simpler, SOF_DEFINE_REG_UUID() macro which sources IDs from the registry by name. Signed-off-by: Andy Ross <andyross@google.com>
thesofproject · Jul 4, 2024 · 1c25b2a · 1c25b2a
1 parent a0e0cef
commit 1c25b2a
Show file tree

Hide file tree

Showing 139 changed files with 157 additions and 462 deletions.
diff --git a/src/audio/aria/aria.c b/src/audio/aria/aria.c
@@ -32,9 +32,7 @@
 LOG_MODULE_REGISTER(aria, CONFIG_SOF_LOG_LEVEL);
 
 /* these ids aligns windows driver requirement to support windows driver */
-/* 99f7166d-372c-43ef-81f6-22007aa15f03 */
-SOF_DEFINE_UUID("aria", aria_uuid, 0x99f7166d, 0x372c, 0x43ef,
-		    0x81, 0xf6, 0x22, 0x00, 0x7a, 0xa1, 0x5f, 0x03);
+SOF_DEFINE_REG_UUID(aria);
 
 DECLARE_TR_CTX(aria_comp_tr, SOF_UUID(aria_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/asrc/asrc_ipc3.c b/src/audio/asrc/asrc_ipc3.c
@@ -16,9 +16,7 @@
 #include <errno.h>
 #include "asrc.h"
 
-/* c8ec72f6-8526-4faf-9d39-a23d0b541de2 */
-SOF_DEFINE_UUID("asrc", asrc_uuid, 0xc8ec72f6, 0x8526, 0x4faf,
-		    0x9d, 0x39, 0xa2, 0x3d, 0x0b, 0x54, 0x1d, 0xe2);
+SOF_DEFINE_REG_UUID(asrc);
 
 DECLARE_TR_CTX(asrc_tr, SOF_UUID(asrc_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/asrc/asrc_ipc4.c b/src/audio/asrc/asrc_ipc4.c
@@ -16,9 +16,7 @@
 #include <errno.h>
 #include "asrc.h"
 
-/* 66b4402d-b468-42f2-81a7-b37121863dd4 */
-SOF_DEFINE_UUID("asrc4", asrc4_uuid, 0x66b4402d, 0xb468, 0x42f2,
-		    0x81, 0xa7, 0xb3, 0x71, 0x21, 0x86, 0x3d, 0xd4);
+SOF_DEFINE_REG_UUID(asrc4);
 
 DECLARE_TR_CTX(asrc_tr, SOF_UUID(asrc4_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/base_fw.c b/src/audio/base_fw.c
@@ -36,9 +36,7 @@
 
 LOG_MODULE_REGISTER(basefw, CONFIG_SOF_LOG_LEVEL);
 
-/* 0e398c32-5ade-ba4b-93b1-c50432280ee4 */
-SOF_DEFINE_UUID("basefw", basefw_uuid, 0xe398c32, 0x5ade, 0xba4b,
-		    0x93, 0xb1, 0xc5, 0x04, 0x32, 0x28, 0x0e, 0xe4);
+SOF_DEFINE_REG_UUID(basefw);
 DECLARE_TR_CTX(basefw_comp_tr, SOF_UUID(basefw_uuid), LOG_LEVEL_INFO);
 
 static struct ipc4_system_time_info global_system_time_info;

diff --git a/src/audio/buffer.c b/src/audio/buffer.c
@@ -27,9 +27,7 @@
 
 LOG_MODULE_REGISTER(buffer, CONFIG_SOF_LOG_LEVEL);
 
-/* 42544c92-8e92-4e41-b679-34519f1c1d28 */
-SOF_DEFINE_UUID("buffer", buffer_uuid, 0x42544c92, 0x8e92, 0x4e41,
-		 0xb6, 0x79, 0x34, 0x51, 0x9f, 0x1c, 0x1d, 0x28);
+SOF_DEFINE_REG_UUID(buffer);
 DECLARE_TR_CTX(buffer_tr, SOF_UUID(buffer_uuid), LOG_LEVEL_INFO);
 
 static struct comp_buffer *buffer_alloc_struct(void *stream_addr, size_t size, uint32_t caps,

diff --git a/src/audio/chain_dma.c b/src/audio/chain_dma.c
@@ -35,9 +35,7 @@ static const uint32_t max_chain_number = DAI_NUM_HDA_OUT + DAI_NUM_HDA_IN;
 
 LOG_MODULE_REGISTER(chain_dma, CONFIG_SOF_LOG_LEVEL);
 
-/* 6a0a274f-27cc-4afb-a3e7-3444723f432e */
-SOF_DEFINE_UUID("chain_dma", chain_dma_uuid, 0x6a0a274f, 0x27cc, 0x4afb,
-		    0xa3, 0xe7, 0x34, 0x44, 0x72, 0x3f, 0x43, 0x2e);
+SOF_DEFINE_REG_UUID(chain_dma);
 DECLARE_TR_CTX(chain_dma_tr, SOF_UUID(chain_dma_uuid), LOG_LEVEL_INFO);
 
 /* chain dma component private data */

diff --git a/src/audio/channel_map.c b/src/audio/channel_map.c
@@ -16,9 +16,7 @@
 
 LOG_MODULE_REGISTER(channel_map, CONFIG_SOF_LOG_LEVEL);
 
-/* ec290e95-4a20-47eb-bbff-d9c888431831 */
-SOF_DEFINE_UUID("chmap", chmap_uuid, 0xec290e95, 0x4a20, 0x47eb,
-		 0xbb, 0xff, 0xd9, 0xc8, 0x88, 0x43, 0x18, 0x31);
+SOF_DEFINE_REG_UUID(chmap);
 
 DECLARE_TR_CTX(chmap_tr, SOF_UUID(chmap_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/codec/dts/dts.c b/src/audio/codec/dts/dts.c
@@ -11,9 +11,7 @@
 
 LOG_MODULE_REGISTER(dts, CONFIG_SOF_LOG_LEVEL);
 
-/* d95fc34f-370f-4ac7-bc86-bfdc5be241e6 */
-SOF_DEFINE_UUID("dts", dts_uuid, 0xd95fc34f, 0x370f, 0x4ac7,
-			0xbc, 0x86, 0xbf, 0xdc, 0x5b, 0xe2, 0x41, 0xe6);
+SOF_DEFINE_REG_UUID(dts);
 DECLARE_TR_CTX(dts_tr, SOF_UUID(dts_uuid), LOG_LEVEL_INFO);
 
 #define MAX_EXPECTED_DTS_CONFIG_DATA_SIZE 8192

diff --git a/src/audio/component.c b/src/audio/component.c
@@ -35,9 +35,7 @@ LOG_MODULE_REGISTER(component, CONFIG_SOF_LOG_LEVEL);
 
 static SHARED_DATA struct comp_driver_list cd;
 
-/* 7c42ce8b-0108-43d0-9137-56d660478c5f */
-SOF_DEFINE_UUID("component", component_uuid, 0x7c42ce8b, 0x0108, 0x43d0,
-		 0x91, 0x37, 0x56, 0xd6, 0x60, 0x47, 0x8c, 0x5f);
+SOF_DEFINE_REG_UUID(component);
 
 DECLARE_TR_CTX(comp_tr, SOF_UUID(component_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/copier/copier.c b/src/audio/copier/copier.c
@@ -48,9 +48,7 @@
 LOG_MODULE_REGISTER(copier, CONFIG_SOF_LOG_LEVEL);
 
 /* this id aligns windows driver requirement to support windows driver */
-/* 9ba00c83-ca12-4a83-943c-1fa2e82f9dda */
-SOF_DEFINE_UUID("copier", copier_uuid, 0x9ba00c83, 0xca12, 0x4a83,
-		    0x94, 0x3c, 0x1f, 0xa2, 0xe8, 0x2f, 0x9d, 0xda);
+SOF_DEFINE_REG_UUID(copier);
 
 DECLARE_TR_CTX(copier_comp_tr, SOF_UUID(copier_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/copier/copier_ipcgtw.c b/src/audio/copier/copier_ipcgtw.c
@@ -13,9 +13,7 @@
 
 LOG_MODULE_REGISTER(ipcgtw, CONFIG_SOF_LOG_LEVEL);
 
-/* a814a1ca-0b83-466c-9587-2f35ff8d12e8 */
-SOF_DEFINE_UUID("ipcgw", ipcgw_uuid, 0xa814a1ca, 0x0b83, 0x466c,
-		    0x95, 0x87, 0x2f, 0x35, 0xff, 0x8d, 0x12, 0xe8);
+SOF_DEFINE_REG_UUID(ipcgw);
 
 DECLARE_TR_CTX(ipcgtw_comp_tr, SOF_UUID(ipcgw_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/crossover/crossover.c b/src/audio/crossover/crossover.c
@@ -40,9 +40,7 @@
 
 LOG_MODULE_REGISTER(crossover, CONFIG_SOF_LOG_LEVEL);
 
-/* 948c9ad1-806a-4131-ad6c-b2bda9e35a9f */
-SOF_DEFINE_UUID("crossover", crossover_uuid, 0x948c9ad1, 0x806a, 0x4131,
-		    0xad, 0x6c, 0xb2, 0xbd, 0xa9, 0xe3, 0x5a, 0x9f);
+SOF_DEFINE_REG_UUID(crossover);
 
 DECLARE_TR_CTX(crossover_tr, SOF_UUID(crossover_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/dai-legacy.c b/src/audio/dai-legacy.c
@@ -39,9 +39,7 @@ static const struct comp_driver comp_dai;
 
 LOG_MODULE_REGISTER(dai_comp, CONFIG_SOF_LOG_LEVEL);
 
-/* c2b00d27-ffbc-4150-a51a-245c79c5e54b */
-SOF_DEFINE_UUID("dai", dai_uuid, 0xc2b00d27, 0xffbc, 0x4150,
-		 0xa5, 0x1a, 0x24, 0x5c, 0x79, 0xc5, 0xe5, 0x4b);
+SOF_DEFINE_REG_UUID(dai);
 
 DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/dai-zephyr.c b/src/audio/dai-zephyr.c
@@ -53,9 +53,7 @@ static const struct comp_driver comp_dai;
 
 LOG_MODULE_REGISTER(dai_comp, CONFIG_SOF_LOG_LEVEL);
 
-/* c2b00d27-ffbc-4150-a51a-245c79c5e54b */
-SOF_DEFINE_UUID("dai", dai_uuid, 0xc2b00d27, 0xffbc, 0x4150,
-		    0xa5, 0x1a, 0x24, 0x5c, 0x79, 0xc5, 0xe5, 0x4b);
+SOF_DEFINE_REG_UUID(dai);
 
 DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/dcblock/dcblock.c b/src/audio/dcblock/dcblock.c
@@ -35,9 +35,7 @@
 
 LOG_MODULE_REGISTER(dcblock, CONFIG_SOF_LOG_LEVEL);
 
-/* b809efaf-5681-42b1-9ed6-04bb012dd384 */
-SOF_DEFINE_UUID("dcblock", dcblock_uuid, 0xb809efaf, 0x5681, 0x42b1,
-		 0x9e, 0xd6, 0x04, 0xbb, 0x01, 0x2d, 0xd3, 0x84);
+SOF_DEFINE_REG_UUID(dcblock);
 
 DECLARE_TR_CTX(dcblock_tr, SOF_UUID(dcblock_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/dp_queue.c b/src/audio/dp_queue.c
@@ -14,9 +14,7 @@
 
 LOG_MODULE_REGISTER(dp_queue, CONFIG_SOF_LOG_LEVEL);
 
-/* 393608d8-4188-11ee-be56-0242ac120002 */
-SOF_DEFINE_UUID("dp_queue", dp_queue_uuid, 0x393608d8, 0x4188, 0x11ee,
-		    0xbe, 0x56, 0x02, 0x42, 0xac, 0x12, 0x20, 0x02);
+SOF_DEFINE_REG_UUID(dp_queue);
 DECLARE_TR_CTX(dp_queue_tr, SOF_UUID(dp_queue_uuid), LOG_LEVEL_INFO);
 
 static inline uint8_t __sparse_cache *dp_queue_buffer_end(struct dp_queue *dp_queue)

diff --git a/src/audio/drc/drc.c b/src/audio/drc/drc.c
@@ -38,9 +38,7 @@
 
 LOG_MODULE_REGISTER(drc, CONFIG_SOF_LOG_LEVEL);
 
-/* b36ee4da-006f-47f9-a06d-fecbe2d8b6ce */
-SOF_DEFINE_UUID("drc", drc_uuid, 0xb36ee4da, 0x006f, 0x47f9,
-		    0xa0, 0x6d, 0xfe, 0xcb, 0xe2, 0xd8, 0xb6, 0xce);
+SOF_DEFINE_REG_UUID(drc);
 
 DECLARE_TR_CTX(drc_tr, SOF_UUID(drc_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/eq_fir/eq_fir.c b/src/audio/eq_fir/eq_fir.c
@@ -40,9 +40,7 @@
 
 LOG_MODULE_REGISTER(eq_fir, CONFIG_SOF_LOG_LEVEL);
 
-/* 43a90ce7-f3a5-41df-ac06-ba98651ae6a3 */
-SOF_DEFINE_UUID("eq_fir", eq_fir_uuid, 0x43a90ce7, 0xf3a5, 0x41df,
-		 0xac, 0x06, 0xba, 0x98, 0x65, 0x1a, 0xe6, 0xa3);
+SOF_DEFINE_REG_UUID(eq_fir);
 
 DECLARE_TR_CTX(eq_fir_tr, SOF_UUID(eq_fir_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/eq_iir/eq_iir.c b/src/audio/eq_iir/eq_iir.c
@@ -37,9 +37,7 @@
 
 LOG_MODULE_REGISTER(eq_iir, CONFIG_SOF_LOG_LEVEL);
 
-/* 5150c0e6-27f9-4ec8-8351-c705b642d12f */
-SOF_DEFINE_UUID("eq_iir", eq_iir_uuid, 0x5150c0e6, 0x27f9, 0x4ec8,
-		 0x83, 0x51, 0xc7, 0x05, 0xb6, 0x42, 0xd1, 0x2f);
+SOF_DEFINE_REG_UUID(eq_iir);
 
 DECLARE_TR_CTX(eq_iir_tr, SOF_UUID(eq_iir_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/google/google_hotword_detect.c b/src/audio/google/google_hotword_detect.c
@@ -44,10 +44,7 @@ static const struct comp_driver ghd_driver;
 
 LOG_MODULE_REGISTER(google_hotword_detect, CONFIG_SOF_LOG_LEVEL);
 
-/* c3c74249-058e-414f-8240-4da5f3fc2389 */
-SOF_DEFINE_UUID("google_hotword", google_hotword_uuid,
-		    0xc3c74249, 0x058e, 0x414f,
-		    0x82, 0x40, 0x4d, 0xa5, 0xf3, 0xfc, 0x23, 0x89);
+SOF_DEFINE_REG_UUID(google_hotword);
 DECLARE_TR_CTX(ghd_tr, SOF_UUID(ghd_uuid), LOG_LEVEL_INFO);
 
 struct comp_data {

diff --git a/src/audio/google/google_rtc_audio_processing.c b/src/audio/google/google_rtc_audio_processing.c
@@ -55,10 +55,7 @@
 
 LOG_MODULE_REGISTER(google_rtc_audio_processing, CONFIG_SOF_LOG_LEVEL);
 
-/* b780a0a6-269f-466f-b477-23dfa05af758 */
-SOF_DEFINE_UUID("google_rtc_audio_processing", google_rtc_audio_processing_uuid,
-					0xb780a0a6, 0x269f, 0x466f, 0xb4, 0x77, 0x23, 0xdf, 0xa0,
-					0x5a, 0xf7, 0x58);
+SOF_DEFINE_REG_UUID(google_rtc_audio_processing);
 
 DECLARE_TR_CTX(google_rtc_audio_processing_tr, SOF_UUID(google_rtc_audio_processing_uuid),
 			   LOG_LEVEL_INFO);

diff --git a/src/audio/host-legacy.c b/src/audio/host-legacy.c
@@ -38,9 +38,7 @@ static const struct comp_driver comp_host;
 
 LOG_MODULE_REGISTER(host, CONFIG_SOF_LOG_LEVEL);
 
-/* 8b9d100c-6d78-418f-90a3-e0e805d0852b */
-SOF_DEFINE_UUID("host", host_uuid, 0x8b9d100c, 0x6d78, 0x418f,
-		 0x90, 0xa3, 0xe0, 0xe8, 0x05, 0xd0, 0x85, 0x2b);
+SOF_DEFINE_REG_UUID(host);
 
 DECLARE_TR_CTX(host_tr, SOF_UUID(host_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/host-zephyr.c b/src/audio/host-zephyr.c
@@ -39,9 +39,7 @@ static const struct comp_driver comp_host;
 
 LOG_MODULE_REGISTER(host_comp, CONFIG_SOF_LOG_LEVEL);
 
-/* 8b9d100c-6d78-418f-90a3-e0e805d0852b */
-SOF_DEFINE_UUID("host", host_uuid, 0x8b9d100c, 0x6d78, 0x418f,
-		    0x90, 0xa3, 0xe0, 0xe8, 0x05, 0xd0, 0x85, 0x2b);
+SOF_DEFINE_REG_UUID(host);
 
 DECLARE_TR_CTX(host_tr, SOF_UUID(host_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/igo_nr/igo_nr.c b/src/audio/igo_nr/igo_nr.c
@@ -44,9 +44,7 @@ enum IGO_NR_ENUM {
 
 LOG_MODULE_REGISTER(igo_nr, CONFIG_SOF_LOG_LEVEL);
 
-/* 696ae2bc-2877-11eb-adc1-0242ac120002 */
-SOF_DEFINE_UUID("igo_nr", igo_nr_uuid,  0x696ae2bc, 0x2877, 0x11eb, 0xad, 0xc1,
-		    0x02, 0x42, 0xac, 0x12, 0x00, 0x02);
+SOF_DEFINE_REG_UUID(igo_nr);
 
 DECLARE_TR_CTX(igo_nr_tr, SOF_UUID(igo_nr_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/kpb.c b/src/audio/kpb.c
@@ -59,22 +59,16 @@ static const struct comp_driver comp_kpb;
 
 LOG_MODULE_REGISTER(kpb, CONFIG_SOF_LOG_LEVEL);
 #if CONFIG_IPC_MAJOR_4
-/* A8A0CB32-4A77-4DB1-85C7-53D7EE07BCE6 */
-SOF_DEFINE_UUID("kpb4", kpb4_uuid, 0xA8A0CB32, 0x4A77, 0x4DB1,
-		    0x85, 0xC7, 0x53, 0xD7, 0xEE, 0x07, 0xBC, 0xE6);
+SOF_DEFINE_REG_UUID(kpb4);
 #define KPB_UUID kpb4_uuid
 #else
-/* d8218443-5ff3-4a4c-b388-6cfe07b9562e */
-SOF_DEFINE_UUID("kpb", kpb_uuid, 0xd8218443, 0x5ff3, 0x4a4c,
-		    0xb3, 0x88, 0x6c, 0xfe, 0x07, 0xb9, 0x56, 0x2e);
+SOF_DEFINE_REG_UUID(kpb);
 #define KPB_UUID kpb_uuid
 #endif
 
 DECLARE_TR_CTX(kpb_tr, SOF_UUID(KPB_UUID), LOG_LEVEL_INFO);
 
-/* e50057a5-8b27-4db4-bd79-9a639cee5f50 */
-SOF_DEFINE_UUID("kpb_task", kpb_task_uuid, 0xe50057a5, 0x8b27, 0x4db4,
-		 0xbd, 0x79, 0x9a, 0x63, 0x9c, 0xee, 0x5f, 0x50);
+SOF_DEFINE_REG_UUID(kpb_task);
 
 /* KPB private data, runtime data */
 struct comp_data {

diff --git a/src/audio/mfcc/mfcc.c b/src/audio/mfcc/mfcc.c
@@ -34,9 +34,7 @@
 
 LOG_MODULE_REGISTER(mfcc, CONFIG_SOF_LOG_LEVEL);
 
-/* db10a773-1aa4-4cea-a21f-2d57a5c982eb */
-SOF_DEFINE_UUID("mfcc", mfcc_uuid, 0xdb10a773, 0x1aa4, 0x4cea,
-		    0xa2, 0x1f, 0x2d, 0x57, 0xa5, 0xc9, 0x82, 0xeb);
+SOF_DEFINE_REG_UUID(mfcc);
 
 DECLARE_TR_CTX(mfcc_tr, SOF_UUID(mfcc_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/mixer/mixer.c b/src/audio/mixer/mixer.c
@@ -35,9 +35,7 @@
 
 LOG_MODULE_REGISTER(mixer, CONFIG_SOF_LOG_LEVEL);
 
-/* bc06c037-12aa-417c-9a97-89282e321a76 */
-SOF_DEFINE_UUID("mixer", mixer_uuid, 0xbc06c037, 0x12aa, 0x417c,
-		 0x9a, 0x97, 0x89, 0x28, 0x2e, 0x32, 0x1a, 0x76);
+SOF_DEFINE_REG_UUID(mixer);
 
 DECLARE_TR_CTX(mixer_tr, SOF_UUID(mixer_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/mixin_mixout/mixin_mixout.c b/src/audio/mixin_mixout/mixin_mixout.c
@@ -34,13 +34,11 @@
 LOG_MODULE_REGISTER(mixin_mixout, CONFIG_SOF_LOG_LEVEL);
 
 /* mixin 39656eb2-3b71-4049-8d3f-f92cd5c43c09 */
-SOF_DEFINE_UUID("mixin", mixin_uuid, 0x39656eb2, 0x3b71, 0x4049,
-		    0x8d, 0x3f, 0xf9, 0x2c, 0xd5, 0xc4, 0x3c, 0x09);
+SOF_DEFINE_REG_UUID(mixin);
 DECLARE_TR_CTX(mixin_tr, SOF_UUID(mixin_uuid), LOG_LEVEL_INFO);
 
 /* mixout 3c56505a-24d7-418f-bddc-c1f5a3ac2ae0 */
-SOF_DEFINE_UUID("mixout", mixout_uuid, 0x3c56505a, 0x24d7, 0x418f,
-		    0xbd, 0xdc, 0xc1, 0xf5, 0xa3, 0xac, 0x2a, 0xe0);
+SOF_DEFINE_REG_UUID(mixout);
 DECLARE_TR_CTX(mixout_tr, SOF_UUID(mixout_uuid), LOG_LEVEL_INFO);
 
 #define MIXIN_MAX_SINKS IPC4_MIXIN_MODULE_MAX_OUTPUT_QUEUES

diff --git a/src/audio/module_adapter/module/cadence.c b/src/audio/module_adapter/module/cadence.c
@@ -18,9 +18,7 @@
 
 LOG_MODULE_REGISTER(cadence, CONFIG_SOF_LOG_LEVEL);
 
-/* d8218443-5ff3-4a4c-b388-6cfe07b956aa */
-SOF_DEFINE_UUID("cadence_codec", cadence_codec_uuid, 0xd8218443, 0x5ff3, 0x4a4c,
-		    0xb3, 0x88, 0x6c, 0xfe, 0x07, 0xb9, 0x56, 0xaa);
+SOF_DEFINE_REG_UUID(cadence_codec);
 
 DECLARE_TR_CTX(cadence_tr, SOF_UUID(cadence_uuid), LOG_LEVEL_INFO);
 

diff --git a/src/audio/module_adapter/module/modules.c b/src/audio/module_adapter/module/modules.c
@@ -42,9 +42,7 @@
  */
 
 LOG_MODULE_REGISTER(sof_modules, CONFIG_SOF_LOG_LEVEL);
-/* ee2585f2-e7d8-43dc-90ab-4224e00c3e84 */
-SOF_DEFINE_UUID("modules", modules_uuid, 0xee2585f2, 0xe7d8, 0x43dc,
-		    0x90, 0xab, 0x42, 0x24, 0xe0, 0x0c, 0x3e, 0x84);
+SOF_DEFINE_REG_UUID(modules);
 DECLARE_TR_CTX(intel_codec_tr, SOF_UUID(modules_uuid), LOG_LEVEL_INFO);
 
 /**

diff --git a/src/audio/module_adapter/module/passthrough.c b/src/audio/module_adapter/module/passthrough.c
@@ -11,9 +11,7 @@
 
 LOG_MODULE_REGISTER(passthrough, CONFIG_SOF_LOG_LEVEL);
 
-/* 376b5e44-9c82-4ec2-bc83-10ea101afa8f */
-SOF_DEFINE_UUID("passthrough", passthrough_uuid, 0x376b5e44, 0x9c82, 0x4ec2,
-		    0xbc, 0x83, 0x10, 0xea, 0x10, 0x1a, 0xf8, 0x8f);
+SOF_DEFINE_REG_UUID(passthrough);
 DECLARE_TR_CTX(passthrough_tr, SOF_UUID(passthrough_uuid), LOG_LEVEL_INFO);
 
 static int passthrough_codec_init(struct processing_module *mod)

diff --git a/src/audio/module_adapter/module/waves/waves.c b/src/audio/module_adapter/module/waves/waves.c
@@ -18,9 +18,7 @@
 #define MAX_CONFIG_SIZE_BYTES (8192)
 #define NUM_IO_STREAMS (1)
 
-/* d944281a-afe9-4695-a043-d7f62b89538e*/
-SOF_DEFINE_UUID("waves", waves_uuid, 0xd944281a, 0xafe9, 0x4695,
-		    0xa0, 0x43, 0xd7, 0xf6, 0x2b, 0x89, 0x53, 0x8e);
+SOF_DEFINE_REG_UUID(waves);
 DECLARE_TR_CTX(waves_tr, SOF_UUID(waves_uuid), LOG_LEVEL_INFO);
 
 struct waves_codec_data {

diff --git a/src/audio/multiband_drc/multiband_drc.c b/src/audio/multiband_drc/multiband_drc.c
@@ -37,9 +37,7 @@
 
 LOG_MODULE_REGISTER(multiband_drc, CONFIG_SOF_LOG_LEVEL);
 
-/* 0d9f2256-8e4f-47b3-8448-239a334f1191 */
-SOF_DEFINE_UUID("multiband_drc", multiband_drc_uuid, 0x0d9f2256, 0x8e4f, 0x47b3,
-		    0x84, 0x48, 0x23, 0x9a, 0x33, 0x4f, 0x11, 0x91);
+SOF_DEFINE_REG_UUID(multiband_drc);
 
 DECLARE_TR_CTX(multiband_drc_tr, SOF_UUID(multiband_drc_uuid), LOG_LEVEL_INFO);