[PATCH 1/2] riscv: cpu: Rename EVENT_SPY to EVENT_SPY_SIMPLE
Fix up cpu.c and align it with commit 6c4cad7438 ("event: Rename EVENT_SPY to EVENT_SPY_FULL")
Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Chanho Park chanho61.park@samsung.com Cc: Leo ycliang@andestech.com Cc: Nikita Shubin n.shubin@yadro.com Cc: Padmarao Begari padmarao.begari@microchip.com Cc: Rick Chen rick@andestech.com Cc: Simon Glass sjg@chromium.org Cc: Yu Chien Peter Lin peterlin@andestech.com --- arch/riscv/cpu/cpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c index d64aa330f20..15beec29875 100644 --- a/arch/riscv/cpu/cpu.c +++ b/arch/riscv/cpu/cpu.c @@ -66,7 +66,7 @@ static inline bool supports_extension(char ext) #endif /* CONFIG_CPU */ }
-static int riscv_cpu_probe(void *ctx, struct event *event) +static int riscv_cpu_probe(void) { #ifdef CONFIG_CPU int ret; @@ -79,7 +79,7 @@ static int riscv_cpu_probe(void *ctx, struct event *event)
return 0; } -EVENT_SPY(EVT_DM_POST_INIT_R, riscv_cpu_probe); +EVENT_SPY_SIMPLE(EVT_DM_POST_INIT_R, riscv_cpu_probe);
/* * This is called on secondary harts just after the IPI is init'd. Currently @@ -96,7 +96,7 @@ int riscv_cpu_setup(void) { int ret;
- ret = riscv_cpu_probe(ctx, event); + ret = riscv_cpu_probe(); if (ret) return ret;
Fix up remaining occurances of EVENT_SPY with no suffix.
Fixes: 6c4cad7438 ("event: Rename EVENT_SPY to EVENT_SPY_FULL") Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: Chanho Park chanho61.park@samsung.com Cc: Leo ycliang@andestech.com Cc: Nikita Shubin n.shubin@yadro.com Cc: Padmarao Begari padmarao.begari@microchip.com Cc: Rick Chen rick@andestech.com Cc: Simon Glass sjg@chromium.org Cc: Yu Chien Peter Lin peterlin@andestech.com --- common/Kconfig | 4 ++-- include/event.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/Kconfig b/common/Kconfig index d916194b942..bdc02f75620 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -620,7 +620,7 @@ config EVENT_DYNAMIC bool help Enable this to support adding an event spy at runtime, without adding - it to the EVENT_SPY() linker list. This increases code size slightly + it to the EVENT_SPY*() linker list. This increases code size slightly but provides more flexibility for boards and subsystems that need it.
config EVENT_DEBUG @@ -648,7 +648,7 @@ config SPL_EVENT_DYNAMIC depends on SPL_EVENT && EVENT_DYNAMIC help Enable this to support adding an event spy at runtime, without adding - it to the EVENT_SPY() linker list. This increases code size slightly + it to the EVENT_SPY*() linker list. This increases code size slightly but provides more flexibility for boards and subsystems that need it.
endif # EVENT diff --git a/include/event.h b/include/event.h index 311df878c4a..5fffde960d0 100644 --- a/include/event.h +++ b/include/event.h @@ -282,9 +282,9 @@ static inline const char *event_spy_id(struct evspy_info *spy) * { * return sandbox_early_getopt_check(); * } - * EVENT_SPY(EVT_MISC_INIT_F, sandbox_misc_init_f); + * EVENT_SPY_FULL(EVT_MISC_INIT_F, sandbox_misc_init_f); * - * where EVENT_SPY uses ll_entry_declare() + * where EVENT_SPY_FULL uses ll_entry_declare() * * In this case, LTO decides to drop the sandbox_misc_init_f() function * (which is fine) but then drops the linker-list entry too. This means
On Tue, 5 Sept 2023 at 07:48, Marek Vasut marek.vasut+renesas@mailbox.org wrote:
Fix up remaining occurances of EVENT_SPY with no suffix.
Fixes: 6c4cad7438 ("event: Rename EVENT_SPY to EVENT_SPY_FULL") Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org
Cc: Chanho Park chanho61.park@samsung.com Cc: Leo ycliang@andestech.com Cc: Nikita Shubin n.shubin@yadro.com Cc: Padmarao Begari padmarao.begari@microchip.com Cc: Rick Chen rick@andestech.com Cc: Simon Glass sjg@chromium.org Cc: Yu Chien Peter Lin peterlin@andestech.com
common/Kconfig | 4 ++-- include/event.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Tue, Sep 05, 2023 at 03:48:08PM +0200, Marek Vasut wrote:
Fix up remaining occurances of EVENT_SPY with no suffix.
Fixes: 6c4cad7438 ("event: Rename EVENT_SPY to EVENT_SPY_FULL") Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
On Tue, 5 Sept 2023 at 07:48, Marek Vasut marek.vasut+renesas@mailbox.org wrote:
Fix up cpu.c and align it with commit 6c4cad7438 ("event: Rename EVENT_SPY to EVENT_SPY_FULL")
Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org
Cc: Chanho Park chanho61.park@samsung.com Cc: Leo ycliang@andestech.com Cc: Nikita Shubin n.shubin@yadro.com Cc: Padmarao Begari padmarao.begari@microchip.com Cc: Rick Chen rick@andestech.com Cc: Simon Glass sjg@chromium.org Cc: Yu Chien Peter Lin peterlin@andestech.com
arch/riscv/cpu/cpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
participants (3)
-
Marek Vasut -
Simon Glass -
Tom Rini