diff options
author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2020-06-02 09:57:56 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-15 14:42:49 +0200 |
commit | 119d453c0b40d4a477781626f944d74d439956da (patch) | |
tree | f9fab4e0334d7e89d4761adedd0ae0a6ab6895da /common | |
parent | b8ae5933bb138ad156af38fdb3226e14dc762f8f (diff) | |
download | barebox-119d453c0b40d4a477781626f944d74d439956da.tar.gz barebox-119d453c0b40d4a477781626f944d74d439956da.tar.xz |
restart: give all restart handlers a descriptive name
With incoming changes to choose a specific reset method, give all
currently unnamed "default" reset handlers a name:
- soc reset via SoC-specific means
- soc-wdt reset via SoC watchdog timer
- vector reset via jump to reset vector
- efi reset via EFI firmware
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
-rw-r--r-- | common/efi/efi.c | 2 | ||||
-rw-r--r-- | common/restart.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/common/efi/efi.c b/common/efi/efi.c index 6f55e3970e..01003dc00f 100644 --- a/common/efi/efi.c +++ b/common/efi/efi.c @@ -292,7 +292,7 @@ static void __noreturn efi_poweroff_system(struct poweroff_handler *handler) static int restart_register_feature(void) { - restart_handler_register_fn(efi_restart_system); + restart_handler_register_fn("efi", efi_restart_system); poweroff_handler_register_fn(efi_poweroff_system); return 0; diff --git a/common/restart.c b/common/restart.c index dd15c8d5c3..0f9e03765d 100644 --- a/common/restart.c +++ b/common/restart.c @@ -47,6 +47,7 @@ int restart_handler_register(struct restart_handler *rst) /** * restart_handler_register_fn() - register a handler function + * @name: restart method name or NULL if name should be auto-generated * @restart_fn: The restart function * * convenience wrapper for restart_handler_register() to register a handler @@ -54,13 +55,15 @@ int restart_handler_register(struct restart_handler *rst) * * return: 0 for success or negative error code */ -int restart_handler_register_fn(void (*restart_fn)(struct restart_handler *)) +int restart_handler_register_fn(const char *name, + void (*restart_fn)(struct restart_handler *)) { struct restart_handler *rst; int ret; rst = xzalloc(sizeof(*rst)); + rst->name = xstrdup(name); rst->restart = restart_fn; ret = restart_handler_register(rst); |