From 973d9b1c87e41d5e44e5f8f39199f51aafbd8367 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Fri, 25 Sep 2026 17:05:34 +0200 Subject: [PATCH] notifier: Remove an unused notifier_register() argument The "flags" argument of notifier_register() is unused, remove it. Signed-off-by: Guennadi Liakhovetski --- src/audio/copier/copier.c | 2 +- src/audio/dai-legacy.c | 6 ++---- src/audio/dai-zephyr.c | 3 +-- src/audio/host-legacy.c | 3 +-- src/audio/kpb.c | 3 +-- src/drivers/dw/dma.c | 2 +- src/include/sof/lib/notifier.h | 6 +----- src/lib/notifier.c | 16 ++-------------- src/schedule/dma_single_chan_domain.c | 3 +-- src/schedule/ll_schedule_xtos.c | 3 +-- test/cmocka/src/notifier_mocks.c | 2 +- 11 files changed, 13 insertions(+), 36 deletions(-) diff --git a/src/audio/copier/copier.c b/src/audio/copier/copier.c index c4a5f04c4926..08d58db9d564 100644 --- a/src/audio/copier/copier.c +++ b/src/audio/copier/copier.c @@ -108,7 +108,7 @@ static int mic_privacy_configure(struct processing_module *mod, struct copier_da cd->mic_priv = mic_priv_data; ret = notifier_register(cd->mic_priv, NULL, NOTIFIER_ID_MIC_PRIVACY_STATE_CHANGE, - mic_privacy_event, 0); + mic_privacy_event); if (ret != 0) mod_free(mod, mic_priv_data); diff --git a/src/audio/dai-legacy.c b/src/audio/dai-legacy.c index 49fb8e011ffd..73f8704de36c 100644 --- a/src/audio/dai-legacy.c +++ b/src/audio/dai-legacy.c @@ -79,8 +79,7 @@ int dai_assign_group(struct dai_data *dd, struct comp_dev *dev, uint32_t group_i group_id, dd->group->num_dais); /* Register for the atomic trigger event */ - notifier_register(dev, dd->group, NOTIFIER_ID_DAI_TRIGGER, - dai_atomic_trigger, 0); + notifier_register(dev, dd->group, NOTIFIER_ID_DAI_TRIGGER, dai_atomic_trigger); return 0; } @@ -635,8 +634,7 @@ int dai_common_config_prepare(struct dai_data *dd, struct comp_dev *dev) dd->chan->index); /* setup callback */ - notifier_register(dev, dd->chan, NOTIFIER_ID_DMA_COPY, - dai_dma_cb, 0); + notifier_register(dev, dd->chan, NOTIFIER_ID_DMA_COPY, dai_dma_cb); return 0; } diff --git a/src/audio/dai-zephyr.c b/src/audio/dai-zephyr.c index 88e2848f19c2..7c011e25b0be 100644 --- a/src/audio/dai-zephyr.c +++ b/src/audio/dai-zephyr.c @@ -103,8 +103,7 @@ __cold int dai_assign_group(struct dai_data *dd, struct comp_dev *dev, uint32_t group_id, dd->group->num_dais); /* Register for the atomic trigger event */ - notifier_register(dev, dd->group, NOTIFIER_ID_DAI_TRIGGER, - dai_atomic_trigger, 0); + notifier_register(dev, dd->group, NOTIFIER_ID_DAI_TRIGGER, dai_atomic_trigger); return 0; } diff --git a/src/audio/host-legacy.c b/src/audio/host-legacy.c index 591b5438f256..d3882931780c 100644 --- a/src/audio/host-legacy.c +++ b/src/audio/host-legacy.c @@ -876,8 +876,7 @@ int host_common_params(struct host_data *hd, struct comp_dev *dev, if (err >= 0) /* set up callback */ - notifier_register(dev, hd->chan, NOTIFIER_ID_DMA_COPY, - cb ? : host_dma_cb, 0); + notifier_register(dev, hd->chan, NOTIFIER_ID_DMA_COPY, cb ? : host_dma_cb); return err; } diff --git a/src/audio/kpb.c b/src/audio/kpb.c index a37c66e0ca08..4eb5e75a9422 100644 --- a/src/audio/kpb.c +++ b/src/audio/kpb.c @@ -938,8 +938,7 @@ static int kpb_prepare(struct comp_dev *dev) kpb_ams_kpd_notification); #else /* Register KPB for notification *on the current core* */ - ret = notifier_register(dev, NULL, NOTIFIER_ID_KPB_CLIENT_EVT, - kpb_event_handler, 0); + ret = notifier_register(dev, NULL, NOTIFIER_ID_KPB_CLIENT_EVT, kpb_event_handler); #endif /* CONFIG_AMS */ #endif diff --git a/src/drivers/dw/dma.c b/src/drivers/dw/dma.c index cfcb4b68cbfb..d0c8158f0518 100644 --- a/src/drivers/dw/dma.c +++ b/src/drivers/dw/dma.c @@ -206,7 +206,7 @@ static struct dma_chan_data *dw_dma_channel_get(struct dma *dma, atomic_add(&dma->num_channels_busy, 1); #if !CONFIG_DMA_HW_LLI notifier_register(&dma->chan[i], &dma->chan[i], - NOTIFIER_ID_DMA_IRQ, dw_dma_chan_reload_lli_cb, 0); + NOTIFIER_ID_DMA_IRQ, dw_dma_chan_reload_lli_cb); #endif /* return channel */ diff --git a/src/include/sof/lib/notifier.h b/src/include/sof/lib/notifier.h index f022b805144c..c6b33ae46a97 100644 --- a/src/include/sof/lib/notifier.h +++ b/src/include/sof/lib/notifier.h @@ -19,9 +19,6 @@ #define NOTIFIER_TARGET_CORE_LOCAL NOTIFIER_TARGET_CORE_MASK(cpu_get_id()) #define NOTIFIER_TARGET_CORE_ALL_MASK 0xFFFFFFFF -/** \brief Notifier flags. */ -#define NOTIFIER_FLAG_AGGREGATE BIT(0) - enum notify_id { NOTIFIER_ID_CPU_FREQ = 0, /* struct clock_notify_data * */ NOTIFIER_ID_SSP_FREQ, /* struct clock_notify_data * */ @@ -71,10 +68,9 @@ typedef void (*notifier_callback_t)(void *receiver_data, enum notify_id event_ty * some specific notifier_event() calls when not NULL. * @param event_type list of callbacks to be added to * @param callback callback function - * @param flags see NOTIFIER_FLAG_* above */ int notifier_register(void *receiver_data, void *caller_id_filter, enum notify_id event_type, - notifier_callback_t callback, uint32_t flags); + notifier_callback_t callback); /** Unregister all callbacks matching that arguments tuple. NULL acts * as a wildcard. diff --git a/src/lib/notifier.c b/src/lib/notifier.c index 9ba712a4aab6..16b1df0dba3d 100644 --- a/src/lib/notifier.c +++ b/src/lib/notifier.c @@ -38,8 +38,7 @@ struct callback_handle { }; int notifier_register(void *receiver, void *caller, enum notify_id type, - void (*cb)(void *arg, enum notify_id type, void *data), - uint32_t flags) + void (*cb)(void *arg, enum notify_id type, void *data)) { struct notify *notify = *arch_notify_get(); struct callback_handle *handle; @@ -50,18 +49,7 @@ int notifier_register(void *receiver, void *caller, enum notify_id type, key = k_spin_lock(¬ify->lock); - /* Find already registered event of this type */ - if (flags & NOTIFIER_FLAG_AGGREGATE && - !list_is_empty(¬ify->list[type])) { - handle = container_of((¬ify->list[type])->next, - struct callback_handle, list); - handle->num_registrations++; - - goto out; - } - - handle = rzalloc(SOF_MEM_FLAG_USER, - sizeof(*handle)); + handle = rzalloc(SOF_MEM_FLAG_USER, sizeof(*handle)); if (!handle) { tr_err(&nt_tr, "callback handle allocation failed."); diff --git a/src/schedule/dma_single_chan_domain.c b/src/schedule/dma_single_chan_domain.c index d234c473586a..a2a5d5bdb059 100644 --- a/src/schedule/dma_single_chan_domain.c +++ b/src/schedule/dma_single_chan_domain.c @@ -246,8 +246,7 @@ static int dma_single_chan_domain_register(struct ll_schedule_domain *domain, /* register for source change notifications */ if (register_needed) - notifier_register(domain, NULL, NOTIFIER_ID_DMA_DOMAIN_CHANGE, - dma_domain_changed, 0); + notifier_register(domain, NULL, NOTIFIER_ID_DMA_DOMAIN_CHANGE, dma_domain_changed); dma_domain->owner = channel->core; diff --git a/src/schedule/ll_schedule_xtos.c b/src/schedule/ll_schedule_xtos.c index 3db989e130d0..073662ff48c5 100644 --- a/src/schedule/ll_schedule_xtos.c +++ b/src/schedule/ll_schedule_xtos.c @@ -796,8 +796,7 @@ int scheduler_init_ll(struct ll_schedule_domain *domain) sch->domain = domain; /* notification of clock changes */ - notifier_register(sch, NULL, NOTIFIER_CLK_CHANGE_ID(domain->clk), - ll_scheduler_notify, 0); + notifier_register(sch, NULL, NOTIFIER_CLK_CHANGE_ID(domain->clk), ll_scheduler_notify); scheduler_init(domain->type, &schedule_ll_ops, sch); diff --git a/test/cmocka/src/notifier_mocks.c b/test/cmocka/src/notifier_mocks.c index bfdb0d488ffe..b5a000fb2e40 100644 --- a/test/cmocka/src/notifier_mocks.c +++ b/test/cmocka/src/notifier_mocks.c @@ -50,7 +50,7 @@ void notifier_event(const void *caller, enum notify_id type, uint32_t core_mask, } int notifier_register(void *receiver, void *caller, enum notify_id type, - void (*cb)(void *arg, enum notify_id type, void *data), uint32_t flags) + void (*cb)(void *arg, enum notify_id type, void *data)) { struct notify *notify = *arch_notify_get(); struct callback_handle *handle;