trace: remove superfluous objects

src/audio/aria/aria.c

@@ -32,8 +32,6 @@ LOG_MODULE_REGISTER(aria, CONFIG_SOF_LOG_LEVEL);
 /* these ids aligns windows driver requirement to support windows driver */
 SOF_DEFINE_REG_UUID(aria);
 
-DECLARE_TR_CTX(aria_comp_tr, SOF_UUID(aria_uuid), LOG_LEVEL_INFO);
-
 /**
  * \brief Aria gain index mapping table
  */
@@ -326,6 +324,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(aria_comp_tr, SOF_UUID(aria_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(aria_interface, aria_uuid, aria_comp_tr);
 SOF_MODULE_INIT(aria, sys_comp_module_aria_interface_init);
 

src/audio/codec/dts/dts.c

@@ -8,11 +8,9 @@
 #include <sof/audio/module_adapter/module/generic.h>
 #include "DtsSofInterface.h"
 
-
 LOG_MODULE_REGISTER(dts, CONFIG_SOF_LOG_LEVEL);
 
 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
 
@@ -480,6 +478,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(dts_tr, SOF_UUID(dts_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(dts_interface, dts_uuid, dts_tr);
 SOF_MODULE_INIT(dts, sys_comp_module_dts_interface_init);
 

src/audio/copier/copier.c

@@ -52,8 +52,6 @@ LOG_MODULE_REGISTER(copier, CONFIG_SOF_LOG_LEVEL);
 /* this id aligns windows driver requirement to support windows driver */
 SOF_DEFINE_REG_UUID(copier);
 
-DECLARE_TR_CTX(copier_comp_tr, SOF_UUID(copier_uuid), LOG_LEVEL_INFO);
-
 #if CONFIG_INTEL_ADSP_MIC_PRIVACY
 static void mic_privacy_event(void *arg, enum notify_id type, void *data)
 {
@@ -1213,5 +1211,7 @@ static const struct module_interface copier_interface = {
 	.endpoint_ops = &copier_endpoint_ops,
 };
 
+DECLARE_TR_CTX(copier_comp_tr, SOF_UUID(copier_uuid), LOG_LEVEL_INFO);
+
 DECLARE_MODULE_ADAPTER(copier_interface, copier_uuid, copier_comp_tr);
 SOF_MODULE_INIT(copier, sys_comp_module_copier_interface_init);

src/audio/copier/copier_ipcgtw.c

@@ -16,8 +16,6 @@ LOG_MODULE_REGISTER(ipcgtw, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(ipcgw);
 
-DECLARE_TR_CTX(ipcgtw_comp_tr, SOF_UUID(ipcgw_uuid), LOG_LEVEL_INFO);
-
 /* List of existing IPC gateways */
 static struct list_item ipcgtw_list_head = LIST_INIT(ipcgtw_list_head);
 

src/audio/crossover/crossover.c

@@ -40,8 +40,6 @@ LOG_MODULE_REGISTER(crossover, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(crossover);
 
-DECLARE_TR_CTX(crossover_tr, SOF_UUID(crossover_uuid), LOG_LEVEL_INFO);
-
 /**
  * \brief Reset the state (coefficients and delay) of the crossover filter
  *	  across all channels
@@ -648,6 +646,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(crossover_tr, SOF_UUID(crossover_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(crossover_interface, crossover_uuid, crossover_tr);
 SOF_MODULE_INIT(crossover, sys_comp_module_crossover_interface_init);
 

src/audio/dai-legacy.c

@@ -41,8 +41,6 @@ LOG_MODULE_REGISTER(dai_comp, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(dai);
 
-DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
-
 #if CONFIG_COMP_DAI_GROUP
 
 static int dai_comp_trigger_internal(struct dai_data *dd, struct comp_dev *dev, int cmd);
@@ -1105,6 +1103,8 @@ static uint64_t dai_get_processed_data(struct comp_dev *dev, uint32_t stream_no,
 	return ret;
 }
 
+DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
+
 static const struct comp_driver comp_dai = {
 	.type	= SOF_COMP_DAI,
 	.uid	= SOF_RT_UUID(dai_uuid),

src/audio/dai-zephyr.c

@@ -64,8 +64,6 @@ LOG_MODULE_REGISTER(dai_comp, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(dai);
 
-DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
-
 #if CONFIG_COMP_DAI_GROUP
 
 static int dai_comp_trigger_internal(struct dai_data *dd, struct comp_dev *dev, int cmd);
@@ -1995,6 +1993,8 @@ int dai_zephyr_unbind(struct dai_data *dd, struct comp_dev *dev, struct bind_inf
 }
 #endif /* CONFIG_IPC_MAJOR_4 */
 
+DECLARE_TR_CTX(dai_comp_tr, SOF_UUID(dai_uuid), LOG_LEVEL_INFO);
+
 static const struct comp_driver comp_dai = {
 	.type	= SOF_COMP_DAI,
 	.uid	= SOF_RT_UUID(dai_uuid),

src/audio/dcblock/dcblock.c

@@ -36,8 +36,6 @@ LOG_MODULE_REGISTER(dcblock, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(dcblock);
 
-DECLARE_TR_CTX(dcblock_tr, SOF_UUID(dcblock_uuid), LOG_LEVEL_INFO);
-
 /**
  * \brief Sets the DC Blocking filter in pass through mode.
  * The frequency response of a DCB filter is:
@@ -272,6 +270,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(dcblock_tr, SOF_UUID(dcblock_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(dcblock_interface, dcblock_uuid, dcblock_tr);
 SOF_MODULE_INIT(dcblock, sys_comp_module_dcblock_interface_init);
 

src/audio/eq_fir/eq_fir.c

@@ -40,8 +40,6 @@ LOG_MODULE_REGISTER(eq_fir, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(eq_fir);
 
-DECLARE_TR_CTX(eq_fir_tr, SOF_UUID(eq_fir_uuid), LOG_LEVEL_INFO);
-
 /* Pass-through functions to replace FIR core while not configured for
  * response.
  */
@@ -499,6 +497,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(eq_fir_tr, SOF_UUID(eq_fir_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(eq_fir_interface, eq_fir_uuid, eq_fir_tr);
 SOF_MODULE_INIT(eq_fir, sys_comp_module_eq_fir_interface_init);
 

src/audio/eq_iir/eq_iir.c

@@ -37,8 +37,6 @@ LOG_MODULE_REGISTER(eq_iir, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(eq_iir);
 
-DECLARE_TR_CTX(eq_iir_tr, SOF_UUID(eq_iir_uuid), LOG_LEVEL_INFO);
-
 /*
  * End of EQ setup code. Next the standard component methods.
  */
@@ -267,6 +265,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(eq_iir_tr, SOF_UUID(eq_iir_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(eq_iir_interface, eq_iir_uuid, eq_iir_tr);
 SOF_MODULE_INIT(eq_iir, sys_comp_module_eq_iir_interface_init);
 

src/audio/google/google_ctc_audio_processing.c

@@ -22,9 +22,6 @@ LOG_MODULE_REGISTER(google_ctc_audio_processing, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(google_ctc_audio_processing);
 
-DECLARE_TR_CTX(google_ctc_audio_processing_tr, SOF_UUID(google_ctc_audio_processing_uuid),
-	       LOG_LEVEL_INFO);
-
 // TODO(eddyhsu): Share these utils function with RTC.
 static inline float clamp_rescale(float max_val, float x)
 {
@@ -475,6 +472,8 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(google_ctc_audio_processing_tr, SOF_UUID(google_ctc_audio_processing_uuid),
+	       LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(google_ctc_audio_processing_interface,
 		       google_ctc_audio_processing_uuid, google_ctc_audio_processing_tr);
 SOF_MODULE_INIT(google_ctc_audio_processing,

src/audio/google/google_hotword_detect.c

@@ -45,7 +45,6 @@ static const struct comp_driver ghd_driver;
 LOG_MODULE_REGISTER(google_hotword_detect, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(google_hotword);
-DECLARE_TR_CTX(ghd_tr, SOF_UUID(ghd_uuid), LOG_LEVEL_INFO);
 
 struct comp_data {
 	struct comp_data_blob_handler *model_handler;
@@ -447,6 +446,8 @@ static int ghd_prepare(struct comp_dev *dev)
 	return comp_set_state(dev, COMP_TRIGGER_PREPARE);
 }
 
+DECLARE_TR_CTX(ghd_tr, SOF_UUID(ghd_uuid), LOG_LEVEL_INFO);
+
 static const struct comp_driver ghd_driver = {
 	.type	= SOF_COMP_KEYWORD_DETECT,
 	.uid	= SOF_RT_UUID(ghd_uuid),

src/audio/google/google_rtc_audio_processing.c

@@ -56,10 +56,6 @@ LOG_MODULE_REGISTER(google_rtc_audio_processing, CONFIG_SOF_LOG_LEVEL);
 
 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);
-
-
 static __aligned(PLATFORM_DCACHE_ALIGN)
 uint8_t aec_mem_blob[CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING_MEMORY_BUFFER_SIZE_KB * 1024];
 
@@ -864,6 +860,8 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(google_rtc_audio_processing_tr, SOF_UUID(google_rtc_audio_processing_uuid),
+			   LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(google_rtc_audio_processing_interface,
 		       google_rtc_audio_processing_uuid, google_rtc_audio_processing_tr);
 SOF_MODULE_INIT(google_rtc_audio_processing,

src/audio/host-legacy.c

@@ -40,8 +40,6 @@ LOG_MODULE_REGISTER(host, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(host);
 
-DECLARE_TR_CTX(host_tr, SOF_UUID(host_uuid), LOG_LEVEL_INFO);
-
 static inline struct dma_sg_elem *next_buffer(struct hc_buf *hc)
 {
 	if (!hc->elem_array.elems || !hc->elem_array.count)
@@ -1005,6 +1003,8 @@ static uint64_t host_get_processed_data(struct comp_dev *dev, uint32_t stream_no
 	return ret;
 }
 
+DECLARE_TR_CTX(host_tr, SOF_UUID(host_uuid), LOG_LEVEL_INFO);
+
 static const struct comp_driver comp_host = {
 	.type	= SOF_COMP_HOST,
 	.uid	= SOF_RT_UUID(host_uuid),

src/audio/host-zephyr.c

@@ -46,8 +46,6 @@ LOG_MODULE_REGISTER(host_comp, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(host);
 
-DECLARE_TR_CTX(host_tr, SOF_UUID(host_uuid), LOG_LEVEL_INFO);
-
 static inline struct dma_sg_elem *next_buffer(struct hc_buf *hc)
 {
 	if (!hc->elem_array.elems || !hc->elem_array.count)
@@ -1260,6 +1258,8 @@ static uint64_t host_get_processed_data(struct comp_dev *dev, uint32_t stream_no
 	return ret;
 }
 
+DECLARE_TR_CTX(host_tr, SOF_UUID(host_uuid), LOG_LEVEL_INFO);
+
 static const struct comp_driver comp_host = {
 	.type	= SOF_COMP_HOST,
 	.uid	= SOF_RT_UUID(host_uuid),

src/audio/igo_nr/igo_nr.c

@@ -44,8 +44,6 @@ LOG_MODULE_REGISTER(igo_nr, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(igo_nr);
 
-DECLARE_TR_CTX(igo_nr_tr, SOF_UUID(igo_nr_uuid), LOG_LEVEL_INFO);
-
 static void igo_nr_lib_process(struct comp_data *cd)
 {
 	/* Pass through the active channel if
@@ -901,6 +899,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(igo_nr_tr, SOF_UUID(igo_nr_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(igo_nr_interface, igo_nr_uuid, igo_nr_tr);
 SOF_MODULE_INIT(igo_nr, sys_comp_module_igo_nr_interface_init);
 

src/audio/kpb.c

@@ -70,8 +70,6 @@ SOF_DEFINE_REG_UUID(kpb);
 #define KPB_UUID kpb_uuid
 #endif
 
-DECLARE_TR_CTX(kpb_tr, SOF_UUID(KPB_UUID), LOG_LEVEL_INFO);
-
 SOF_DEFINE_REG_UUID(kpb_task);
 
 /* KPB private data, runtime data */
@@ -2679,6 +2677,8 @@ static int kpb_set_large_config(struct comp_dev *dev, uint32_t param_id,
 	}
 }
 
+DECLARE_TR_CTX(kpb_tr, SOF_UUID(KPB_UUID), LOG_LEVEL_INFO);
+
 static const struct comp_driver comp_kpb = {
 	.type = SOF_COMP_KPB,
 	.uid = SOF_RT_UUID(KPB_UUID),

src/audio/level_multiplier/level_multiplier.c

@@ -17,11 +17,6 @@ SOF_DEFINE_REG_UUID(level_multiplier);
 /* Creates logging data for the component */
 LOG_MODULE_REGISTER(level_multiplier, CONFIG_SOF_LOG_LEVEL);
 
-/* Creates the component trace. Traces show in trace console the component
- * info, warning, and error messages.
- */
-DECLARE_TR_CTX(level_multiplier_tr, SOF_UUID(level_multiplier_uuid), LOG_LEVEL_INFO);
-
 /**
  * level_multiplier_init() - Initialize the level_multiplier component.
  * @mod: Pointer to module data.
@@ -205,6 +200,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(level_multiplier_tr, SOF_UUID(level_multiplier_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(level_multiplier_interface, level_multiplier_uuid, level_multiplier_tr);
 SOF_MODULE_INIT(level_multiplier, sys_comp_module_level_multiplier_interface_init);
 

src/audio/mfcc/mfcc.c

@@ -36,8 +36,6 @@ LOG_MODULE_REGISTER(mfcc, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(mfcc);
 
-DECLARE_TR_CTX(mfcc_tr, SOF_UUID(mfcc_uuid), LOG_LEVEL_INFO);
-
 __cold_rodata const struct mfcc_func_map mfcc_fm[] = {
 #if CONFIG_FORMAT_S16LE
 	{SOF_IPC_FRAME_S16_LE,  mfcc_s16_default},
@@ -274,6 +272,7 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(mfcc_tr, SOF_UUID(mfcc_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(mfcc_interface, mfcc_uuid, mfcc_tr);
 SOF_MODULE_INIT(mfcc, sys_comp_module_mfcc_interface_init);
 

src/audio/mixer/mixer.c

@@ -35,9 +35,6 @@ LOG_MODULE_REGISTER(mixer, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(mixer);
 
-DECLARE_TR_CTX(mixer_tr, SOF_UUID(mixer_uuid), LOG_LEVEL_INFO);
-
-
 static int mixer_init(struct processing_module *mod)
 {
 	struct module_data *mod_data = &mod->priv;
@@ -256,5 +253,6 @@ static const struct module_interface mixer_interface = {
 	.free = mixer_free,
 };
 
+DECLARE_TR_CTX(mixer_tr, SOF_UUID(mixer_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(mixer_interface, mixer_uuid, mixer_tr);
 SOF_MODULE_INIT(mixer, sys_comp_module_mixer_interface_init);

src/audio/mixin_mixout/mixin_mixout.c

@@ -35,11 +35,9 @@ LOG_MODULE_REGISTER(mixin_mixout, CONFIG_SOF_LOG_LEVEL);
 
 /* mixin 39656eb2-3b71-4049-8d3f-f92cd5c43c09 */
 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_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
 #define MIXOUT_MAX_SOURCES IPC4_MIXOUT_MODULE_MAX_INPUT_QUEUES
@@ -1050,9 +1048,11 @@ SOF_LLEXT_BUILDINFO;
 
 #else
 
+DECLARE_TR_CTX(mixin_tr, SOF_UUID(mixin_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(mixin_interface, mixin_uuid, mixin_tr);
 SOF_MODULE_INIT(mixin, sys_comp_module_mixin_interface_init);
 
+DECLARE_TR_CTX(mixout_tr, SOF_UUID(mixout_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(mixout_interface, mixout_uuid, mixout_tr);
 SOF_MODULE_INIT(mixout, sys_comp_module_mixout_interface_init);
 

src/audio/module_adapter/module/cadence.c

@@ -20,8 +20,6 @@ LOG_MODULE_REGISTER(cadence_codec, CONFIG_SOF_LOG_LEVEL);
 
 SOF_DEFINE_REG_UUID(cadence_codec);
 
-DECLARE_TR_CTX(cadence_codec_tr, SOF_UUID(cadence_codec_uuid), LOG_LEVEL_INFO);
-
 enum cadence_api_id {
 	CADENCE_CODEC_WRAPPER_ID	= 0x01,
 	CADENCE_CODEC_AAC_DEC_ID	= 0x02,
@@ -925,5 +923,6 @@ static const struct module_interface cadence_codec_interface = {
 	.free = cadence_codec_free
 };
 
+DECLARE_TR_CTX(cadence_codec_tr, SOF_UUID(cadence_codec_uuid), LOG_LEVEL_INFO);
 DECLARE_MODULE_ADAPTER(cadence_codec_interface, cadence_codec_uuid, cadence_codec_tr);
 SOF_MODULE_INIT(cadence_codec, sys_comp_module_cadence_codec_interface_init);