Skip to content

Commit faace2e

Browse files
committed
notifier: Remove an unused notifier_register() argument
The "flags" argument of notifier_register() is unused, remove it. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
1 parent 8293527 commit faace2e

11 files changed

Lines changed: 13 additions & 36 deletions

File tree

‎src/audio/copier/copier.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static int mic_privacy_configure(struct processing_module *mod, struct copier_da
108108
cd->mic_priv = mic_priv_data;
109109

110110
ret = notifier_register(cd->mic_priv, NULL, NOTIFIER_ID_MIC_PRIVACY_STATE_CHANGE,
111-
mic_privacy_event, 0);
111+
mic_privacy_event);
112112

113113
if (ret != 0)
114114
mod_free(mod, mic_priv_data);

‎src/audio/dai-legacy.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ int dai_assign_group(struct dai_data *dd, struct comp_dev *dev, uint32_t group_i
7979
group_id, dd->group->num_dais);
8080

8181
/* Register for the atomic trigger event */
82-
notifier_register(dev, dd->group, NOTIFIER_ID_DAI_TRIGGER,
83-
dai_atomic_trigger, 0);
82+
notifier_register(dev, dd->group, NOTIFIER_ID_DAI_TRIGGER, dai_atomic_trigger);
8483

8584
return 0;
8685
}
@@ -635,8 +634,7 @@ int dai_common_config_prepare(struct dai_data *dd, struct comp_dev *dev)
635634
dd->chan->index);
636635

637636
/* setup callback */
638-
notifier_register(dev, dd->chan, NOTIFIER_ID_DMA_COPY,
639-
dai_dma_cb, 0);
637+
notifier_register(dev, dd->chan, NOTIFIER_ID_DMA_COPY, dai_dma_cb);
640638

641639
return 0;
642640
}

‎src/audio/dai-zephyr.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ __cold int dai_assign_group(struct dai_data *dd, struct comp_dev *dev, uint32_t
103103
group_id, dd->group->num_dais);
104104

105105
/* Register for the atomic trigger event */
106-
notifier_register(dev, dd->group, NOTIFIER_ID_DAI_TRIGGER,
107-
dai_atomic_trigger, 0);
106+
notifier_register(dev, dd->group, NOTIFIER_ID_DAI_TRIGGER, dai_atomic_trigger);
108107

109108
return 0;
110109
}

‎src/audio/host-legacy.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -876,8 +876,7 @@ int host_common_params(struct host_data *hd, struct comp_dev *dev,
876876

877877
if (err >= 0)
878878
/* set up callback */
879-
notifier_register(dev, hd->chan, NOTIFIER_ID_DMA_COPY,
880-
cb ? : host_dma_cb, 0);
879+
notifier_register(dev, hd->chan, NOTIFIER_ID_DMA_COPY, cb ? : host_dma_cb);
881880

882881
return err;
883882
}

‎src/audio/kpb.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -876,8 +876,7 @@ static int kpb_prepare(struct comp_dev *dev)
876876
kpb_ams_kpd_notification);
877877
#else
878878
/* Register KPB for notification */
879-
ret = notifier_register(dev, NULL, NOTIFIER_ID_KPB_CLIENT_EVT,
880-
kpb_event_handler, 0);
879+
ret = notifier_register(dev, NULL, NOTIFIER_ID_KPB_CLIENT_EVT, kpb_event_handler);
881880
#endif /* CONFIG_AMS */
882881

883882
if (ret < 0) {

‎src/drivers/dw/dma.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ static struct dma_chan_data *dw_dma_channel_get(struct dma *dma,
206206
atomic_add(&dma->num_channels_busy, 1);
207207
#if !CONFIG_DMA_HW_LLI
208208
notifier_register(&dma->chan[i], &dma->chan[i],
209-
NOTIFIER_ID_DMA_IRQ, dw_dma_chan_reload_lli_cb, 0);
209+
NOTIFIER_ID_DMA_IRQ, dw_dma_chan_reload_lli_cb);
210210
#endif
211211

212212
/* return channel */

‎src/include/sof/lib/notifier.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
#define NOTIFIER_TARGET_CORE_LOCAL NOTIFIER_TARGET_CORE_MASK(cpu_get_id())
2020
#define NOTIFIER_TARGET_CORE_ALL_MASK 0xFFFFFFFF
2121

22-
/** \brief Notifier flags. */
23-
#define NOTIFIER_FLAG_AGGREGATE BIT(0)
24-
2522
enum notify_id {
2623
NOTIFIER_ID_CPU_FREQ = 0, /* struct clock_notify_data * */
2724
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
7168
* some specific notifier_event() calls when not NULL.
7269
* @param event_type list of callbacks to be added to
7370
* @param callback callback function
74-
* @param flags see NOTIFIER_FLAG_* above
7571
*/
7672
int notifier_register(void *receiver_data, void *caller_id_filter, enum notify_id event_type,
77-
notifier_callback_t callback, uint32_t flags);
73+
notifier_callback_t callback);
7874

7975
/** Unregister all callbacks matching that arguments tuple. NULL acts
8076
* as a wildcard.

‎src/lib/notifier.c‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ struct callback_handle {
3838
};
3939

4040
int notifier_register(void *receiver, void *caller, enum notify_id type,
41-
void (*cb)(void *arg, enum notify_id type, void *data),
42-
uint32_t flags)
41+
void (*cb)(void *arg, enum notify_id type, void *data))
4342
{
4443
struct notify *notify = *arch_notify_get();
4544
struct callback_handle *handle;
@@ -50,18 +49,7 @@ int notifier_register(void *receiver, void *caller, enum notify_id type,
5049

5150
key = k_spin_lock(&notify->lock);
5251

53-
/* Find already registered event of this type */
54-
if (flags & NOTIFIER_FLAG_AGGREGATE &&
55-
!list_is_empty(&notify->list[type])) {
56-
handle = container_of((&notify->list[type])->next,
57-
struct callback_handle, list);
58-
handle->num_registrations++;
59-
60-
goto out;
61-
}
62-
63-
handle = rzalloc(SOF_MEM_FLAG_USER,
64-
sizeof(*handle));
52+
handle = rzalloc(SOF_MEM_FLAG_USER, sizeof(*handle));
6553

6654
if (!handle) {
6755
tr_err(&nt_tr, "callback handle allocation failed.");

‎src/schedule/dma_single_chan_domain.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,7 @@ static int dma_single_chan_domain_register(struct ll_schedule_domain *domain,
246246

247247
/* register for source change notifications */
248248
if (register_needed)
249-
notifier_register(domain, NULL, NOTIFIER_ID_DMA_DOMAIN_CHANGE,
250-
dma_domain_changed, 0);
249+
notifier_register(domain, NULL, NOTIFIER_ID_DMA_DOMAIN_CHANGE, dma_domain_changed);
251250

252251
dma_domain->owner = channel->core;
253252

‎src/schedule/ll_schedule_xtos.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -796,8 +796,7 @@ int scheduler_init_ll(struct ll_schedule_domain *domain)
796796
sch->domain = domain;
797797

798798
/* notification of clock changes */
799-
notifier_register(sch, NULL, NOTIFIER_CLK_CHANGE_ID(domain->clk),
800-
ll_scheduler_notify, 0);
799+
notifier_register(sch, NULL, NOTIFIER_CLK_CHANGE_ID(domain->clk), ll_scheduler_notify);
801800

802801
scheduler_init(domain->type, &schedule_ll_ops, sch);
803802

0 commit comments

Comments
 (0)