From 4aa5053da5fa0729d30bce5df9a0a037a391f2f3 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 15 Jan 2023 14:15:42 -0700 Subject: timer: Tidy up use of notrace Tracing is typically enabled by the time driver model starts up, so there is no point in adding a 'notrace' to the timer-init function. However, once the driver model timer is enabled, we do need to be able to access the timer's private data when reading the timer, so add it to the core function needed for that. Update the function's documentation while we are here. Signed-off-by: Simon Glass --- drivers/core/device.c | 3 ++- drivers/timer/timer-uclass.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/core/device.c b/drivers/core/device.c index d9ce546..6e26b64 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -654,7 +654,8 @@ void *dev_get_priv(const struct udevice *dev) return dm_priv_to_rw(dev->priv_); } -void *dev_get_uclass_priv(const struct udevice *dev) +/* notrace is needed as this is called by timer_get_rate() */ +notrace void *dev_get_uclass_priv(const struct udevice *dev) { if (!dev) { dm_warn("%s: null device\n", __func__); diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index bb71979..f4b871a 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -136,7 +136,7 @@ u64 timer_conv_64(u32 count) return ((u64)gd->timebase_h << 32) | gd->timebase_l; } -int notrace dm_timer_init(void) +int dm_timer_init(void) { struct udevice *dev = NULL; __maybe_unused ofnode node; -- cgit v1.1